projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 686d5ca a2a28b2)
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)
Conflicts:
framework/Prefs/lib/Horde/Prefs/Ui.php


Trivial merge
Unnamed repository; edit this file to name it for gitweb.