Merge branch 'master' of ssh://git.auf/auf_bulletin
authormarc.nachin <you@example.commarc.nachin@auf.org>
Mon, 10 Sep 2012 12:52:55 +0000 (14:52 +0200)
committermarc.nachin <you@example.commarc.nachin@auf.org>
Mon, 10 Sep 2012 12:52:55 +0000 (14:52 +0200)

Trivial merge