Merge remote-tracking branch 'gekitsuu/master' (closes PR #1913)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 7 Dec 2013 09:48:15 +0000 (10:48 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 7 Dec 2013 09:50:06 +0000 (10:50 +0100)

Trivial merge