Merge branch 'bug-421027'
authorSebastian Pipping <sebastian@pipping.org>
Sun, 8 Jul 2012 17:18:46 +0000 (19:18 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 8 Jul 2012 17:18:46 +0000 (19:18 +0200)
commit636cbc75c14005d10361cda8f6f0b4bad280bf44
tree3bf10798291e6e23f8fa94da291ec72adbed3cc8
parent2413f1f2a334e1d464713dd8ce0eb8c0f711dc29
parent0db56cdc9d5166abaaaf0b23406cf06d775e2bca
Merge branch 'bug-421027'

Conflicts:
ChangeLog
ChangeLog