Merge branch 'bug-940' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Tue, 20 Sep 2011 20:00:02 +0000 (22:00 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Tue, 20 Sep 2011 20:00:02 +0000 (22:00 +0200)
commit863618723ff55b4ebb19da4f5144ca7790e8748c
treed0e6eec38078c62975e37f58e464d7a46697166b
parent8fffc62bc13a2429baab9714085c492490903e56
parent4fa23e4e034324b82ee1e94c89fafa12981cf01a
Merge branch 'bug-940' into release