Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:23:18 +0000 (09:23 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:23:18 +0000 (09:23 +0200)

Trivial merge