Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 16 Dec 2012 01:48:38 +0000 (02:48 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sun, 16 Dec 2012 01:48:38 +0000 (02:48 +0100)

Trivial merge