Merge remote-tracking branch 'origin/bug-846' into bug-846 bug-846
authorBernhard Froehlich <bernhard@cacert.org>
Sat, 24 Sep 2011 23:34:43 +0000 (01:34 +0200)
committerBernhard Froehlich <bernhard@cacert.org>
Sat, 24 Sep 2011 23:34:43 +0000 (01:34 +0200)
commit1d0489468ab739a695deaecf09569a233ed54309
tree34e5d705dfb5290b6b6334864c2ba2e51164fdd3
parent235788dbb6d050fe0c0d3a02771a508331c02e73
parentb896a137cbb0ace737f74938e2ac65f05d8ac5bd
Merge remote-tracking branch 'origin/bug-846' into bug-846