Merge branch 'master' into newprefs
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 7 Apr 2010 13:26:00 +0000 (07:26 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Wed, 7 Apr 2010 13:26:00 +0000 (07:26 -0600)
commit8512cb689bf91c9d74f7742a9443cd31e6664499
treeecac47356b78e80cb08c10fe817a552f6690c8df
parent686d5ca6ac47356af4ec4620486adff71baecdce
parenta2a28b2b2cda5de92aceefbf1c5cc8258c6c5c0b
Merge branch 'master' into newprefs

Conflicts:
framework/Prefs/lib/Horde/Prefs/Ui.php