Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 23 Nov 2013 12:41:52 +0000 (13:41 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 23 Nov 2013 12:41:52 +0000 (13:41 +0100)

Trivial merge