Merge branch 'bug-846' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 20 Oct 2011 21:24:28 +0000 (23:24 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 20 Oct 2011 21:24:28 +0000 (23:24 +0200)
commitdf07bc8d5d1bc0a471e80d1d450d0a06a43ff684
tree812ea0d903127b5cc8cb3396798a910da94cc78a
parent9fbc1a84044a2e7e04de6422d5ef1b6887b401a3
parent1d0489468ab739a695deaecf09569a233ed54309
Merge branch 'bug-846' into release