Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Mon, 22 May 2017 12:47:32 +0000 (14:47 +0200)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Mon, 22 May 2017 12:47:32 +0000 (14:47 +0200)

Trivial merge