Merge remote-tracking branch 'nodogsplash/master'
authorSaverio Proto <zioproto@gmail.com>
Sat, 11 May 2013 12:47:22 +0000 (14:47 +0200)
committerSaverio Proto <zioproto@gmail.com>
Sat, 11 May 2013 12:47:22 +0000 (14:47 +0200)

Trivial merge