Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 31 May 2013 15:59:11 +0000 (17:59 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 31 May 2013 15:59:11 +0000 (17:59 +0200)

Trivial merge