Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Thu, 13 Jun 2013 20:45:14 +0000 (22:45 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Thu, 13 Jun 2013 20:45:14 +0000 (22:45 +0200)

Trivial merge