Merge branch 'master' into halfandquarter halfandquarter
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 23 Nov 2013 14:11:26 +0000 (15:11 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 23 Nov 2013 14:11:26 +0000 (15:11 +0100)

Trivial merge