Merge branch 'master' into hinting-g-mode
authorDaniel Carl <danielcarl@gmx.de>
Fri, 20 Dec 2013 23:53:27 +0000 (00:53 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Fri, 20 Dec 2013 23:53:27 +0000 (00:53 +0100)

Trivial merge