Merge branch 'feature/marks'
authorDaniel Carl <danielcarl@gmx.de>
Thu, 16 Jan 2014 21:22:51 +0000 (22:22 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Thu, 16 Jan 2014 21:22:51 +0000 (22:22 +0100)

Trivial merge