From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Mon, 26 Jun 2017 19:05:59 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'master'
X-Git-Tag: 17.05.00~13
X-Git-Url: http://git.equinoxoli.org/?p=kohadocs.git;a=commitdiff_plain;h=8099a64a3361b4c8cfe4d7d1de7258559e1cccf8

Merge branch 'patch-2' into 'master'

Included the remainder of the System Preferences added in Koha 16.11

See merge request !14
---

8099a64a3361b4c8cfe4d7d1de7258559e1cccf8