Merge branch 'master' of https://rhodecode.plunge.at/ach/ach-master
authorPepi Zawodsky <git@maclemon.at>
Sun, 3 Nov 2013 20:43:35 +0000 (21:43 +0100)
committerPepi Zawodsky <git@maclemon.at>
Sun, 3 Nov 2013 20:43:35 +0000 (21:43 +0100)

Trivial merge