Merge commit 'origin/master' into bl-sopac
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 30 Sep 2009 00:22:11 +0000 (20:22 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 30 Sep 2009 00:22:11 +0000 (20:22 -0400)
commit868b8cdbaa079a948a6015f713fa3384a7f404b5
treed6a19a988f054eff8ba6a7242bcd54385d762ccb
parent2f99d99991f7d45d16b16ab66bb447d45833eb55
parent17c831399f2cd953935ef31892d30845f96c8a94
Merge commit 'origin/master' into bl-sopac
admin/systempreferences.pl