Merge branch 'bug-954' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 27 Jul 2011 21:10:23 +0000 (23:10 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 27 Jul 2011 21:10:23 +0000 (23:10 +0200)
commitadf56e3dd970ae49e906603d33fa738350e7648e
treee12f2f223e8bd83f0ee9625f40b9e3fc3b73a9c1
parent436fabea4e9af481364dbd9d71c4df33dacc7d31
parent900d6e061e04c38ef72bbe73ac53d3f083eda01a
Merge branch 'bug-954' into release