Merge remote-tracking branch 'iemejia/master'
authorIsmaël Mejía <iemejia@gmail.com>
Sat, 2 Nov 2013 18:56:06 +0000 (19:56 +0100)
committerIsmaël Mejía <iemejia@gmail.com>
Sat, 2 Nov 2013 18:56:06 +0000 (19:56 +0100)

Trivial merge