Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Thu, 11 May 2017 11:40:13 +0000 (13:40 +0200)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Thu, 11 May 2017 11:40:13 +0000 (13:40 +0200)

Trivial merge