Merge branch 'master' into newprefs
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 12 Apr 2010 18:15:42 +0000 (12:15 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 12 Apr 2010 18:15:42 +0000 (12:15 -0600)
commit77973af085858e48607e151fe16d1641f85522cc
tree09a850541a7939a040cbffd4279dd37e1419423d
parent6088737580d296bba258f85ad6f0a7edc7ddb14f
parent1b920d46c68f59a08d617ff40b3df7ef6d7aeaeb
Merge branch 'master' into newprefs

Conflicts:
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
kronolith/lib/Event.php
framework/ActiveSync/lib/Horde/ActiveSync.php
framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
kronolith/lib/Kronolith.php
kronolith/themes/screen.css