Merge branch 'master' of ssh://git.auf/ifgu 0.5
authormarc.nachin <you@example.commarc.nachin@auf.org>
Thu, 21 Feb 2013 17:36:15 +0000 (18:36 +0100)
committermarc.nachin <you@example.commarc.nachin@auf.org>
Thu, 21 Feb 2013 17:36:15 +0000 (18:36 +0100)

Trivial merge