Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 25 Oct 2013 20:59:44 +0000 (22:59 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 25 Oct 2013 20:59:44 +0000 (22:59 +0200)

Trivial merge