Merge branch 'feature-settings-page' into development
authorLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:34:52 +0000 (16:34 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:34:52 +0000 (16:34 +0100)

Trivial merge