Merge branch 'patch-2' into 'master'
authorKatrin Fischer <katrin.fischer.83@web.de>
Mon, 26 Jun 2017 19:05:59 +0000 (19:05 +0000)
committerKatrin Fischer <katrin.fischer.83@web.de>
Mon, 26 Jun 2017 19:05:59 +0000 (19:05 +0000)
Included the remainder of the System Preferences added in Koha 16.11

See merge request !14


Trivial merge