make bug 997131 work actually work on both sides of the change and merge branches
authorRobert Kaiser <kairo@kairo.at>
Sun, 6 Jul 2014 23:53:12 +0000 (01:53 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 6 Jul 2014 23:53:12 +0000 (01:53 +0200)
commit94863ccc203336a3b8c0b976b14e23b4b8ee7db9
treefaf102713a769b832e141e8d8a320bd84e8400ec
parent7c01f627c37d74dee4e676d875cead8fc92d1397
parentf897a590a135f4de8227cc5cc228bd0b60885c05
make bug 997131 work actually work on both sides of the change and merge branches