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)
commit0fe7b5fedabe7507630b04f0817fb1d549241345
treefb9ff50ab27f3900d32567bd2cf2a08bfbfc3769
parente1f2a0653013ceda7ad8cde03f1e1bcbc19a59ed
parent33523106677056f6faa072bf55933b88dcf1e725
Merge remote-tracking branch 'origin/master' into move-to-luna