merge
authorChristian Heimes <christian@cheimes.de>
Sun, 13 Oct 2013 00:22:10 +0000 (02:22 +0200)
committerChristian Heimes <christian@cheimes.de>
Sun, 13 Oct 2013 00:22:10 +0000 (02:22 +0200)

Trivial merge