Merge remote-tracking branch 'origin/master' into move-to-luna
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 21 May 2015 09:33:44 +0000 (11:33 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 21 May 2015 09:33:44 +0000 (11:33 +0200)

Trivial merge