Merge remote-tracking branch 'stabledog/master'
authorDaniel Carl <danielcarl@gmx.de>
Sat, 4 Jan 2014 18:55:15 +0000 (19:55 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Sat, 4 Jan 2014 18:55:15 +0000 (19:55 +0100)

Trivial merge