Merge branch 'master' into newprefs
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 12 Apr 2010 20:00:45 +0000 (14:00 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 12 Apr 2010 20:00:45 +0000 (14:00 -0600)
commit1e63558fbcc523b289b2a67e6b61ab32e9854861
tree3890fce9f74eb90127bb0e5a2d43ebb26e55f2d8
parent3c283a9bd54c0c54771a468c31a873882528e3d5
parent57a595f9d9c400dd69e82c4d4c5e19fbd141cbc2
Merge branch 'master' into newprefs
framework/ActiveSync/lib/Horde/ActiveSync.php
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
imp/config/prefs.php.dist