Merge branch 'origin/new/bug3756_reenable_local_sysprefs' of git://git.tamil.fr/git...
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 28 Jul 2010 00:32:28 +0000 (20:32 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 28 Jul 2010 00:32:40 +0000 (20:32 -0400)
commit2e31837759002fe8b2b807079c8d1f1ca2e24085
treea04ca7a90e38f9f4a5b7d2d51e66c46ca292d199
parent572670d377bfe11357316c4f9d69a9c5f00e5649
parentec3913e1aabe28bc5dd43c3af401a7e2bf80f677
Merge branch 'origin/new/bug3756_reenable_local_sysprefs' of git://git.tamil.fr/git/koha into to-push

* 'origin/new/bug3756_reenable_local_sysprefs' of git://git.tamil.fr/git/koha:
  Bug 3756 Don't display as local AutoSelfCheckID syspref and others

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>