Branching bug fix.
authorDavid Given <dg@cowlark.com>
Sat, 4 Jun 2016 10:57:25 +0000 (12:57 +0200)
committerDavid Given <dg@cowlark.com>
Sat, 4 Jun 2016 10:57:25 +0000 (12:57 +0200)
--HG--
branch : default-branch


Trivial merge