Merge commit 'origin/master' into sopac
authorGalen Charlton <gmcharlt@gmail.com>
Tue, 8 Sep 2009 21:16:22 +0000 (17:16 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Tue, 8 Sep 2009 21:16:22 +0000 (17:16 -0400)
commit2f99d99991f7d45d16b16ab66bb447d45833eb55
tree6893431a93b7573e308afb906273ea0491549488
parentf7f783226abd73c3a4bd58b76fcd8b3893e9022d
parentfa2e9e495898e8175f7424cfaf88dd251c25d2b7
Merge commit 'origin/master' into sopac
admin/systempreferences.pl