Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Fri, 18 Nov 2016 13:30:47 +0000 (14:30 +0100)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Fri, 18 Nov 2016 13:30:47 +0000 (14:30 +0100)

Trivial merge