Merge branch 'release' of ssh://git-dev.cacert/var/cache/git/cacert-devel into bug-596
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 14 Sep 2011 21:54:08 +0000 (23:54 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 14 Sep 2011 21:54:08 +0000 (23:54 +0200)

Trivial merge