master is now clean2
authordamianmichna <damian@michna.de>
Sat, 6 Jul 2013 15:24:35 +0000 (6 17:24 +0200)
committerdamianmichna <damian@michna.de>
Sat, 6 Jul 2013 15:24:35 +0000 (6 17:24 +0200)

Trivial merge