Merge c93cb8071ead39bfbfd0d2215c928eba5f4b3ee1 and
authorJan Schneider <jan@horde.org>
Wed, 25 Aug 2010 10:25:36 +0000 (12:25 +0200)
committerJan Schneider <jan@horde.org>
Wed, 25 Aug 2010 10:37:39 +0000 (12:37 +0200)
commit12246a1c9768abbb852713c0385b5dcb083e4af7
treea60b87b1504bb183ccd374df23b7f4be578e2a3f
parentebc1330e4b73dd7a0b6802a64a45fbd7c7a417d9
Merge c93cb8071ead39bfbfd0d2215c928eba5f4b3ee1 and
e649acf414796c7b4dbd3b2e79b1169c9f1603f9 from Kronolith.
mnemo/data.php
nag/data.php