Merge branch 'bug-855' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 19 Jan 2012 18:59:54 +0000 (19:59 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 19 Jan 2012 18:59:54 +0000 (19:59 +0100)
commitf712965620c90c1d1a8213ef7b27acadc41002db
tree74bb145a3752a43c25598da9dfe389e2d1584966
parent22fb084237713f5041def5161a2df884b1b24f74
parentb87800efc6d6309f0487bee2f3c3491f58846132
Merge branch 'bug-855' into release