[commits] Horde branch Horde_ActiveSync created. 6172a021019781f41dc65dc99f2af0eba2ce4bb8

[Michael Rubinsky]

The branch "Horde_ActiveSync" has been created.
        at  6172a021019781f41dc65dc99f2af0eba2ce4bb8 (commit)

-----------------------------------------------------------------------
commit 6172a021019781f41dc65dc99f2af0eba2ce4bb8
Merge: d69ac2683c56dd5c526d21d6b4faae6b42c15091 c3458e6dd9780340bb18f6e54fdd10b02e880f52
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Tue Feb 2 20:48:19 2010 -0500

    Merge branch 'master' into Horde_ActiveSync
    
    Conflicts:
    	horde/rpc.php
    	imp/scripts/query-imap-cache.php

commit d69ac2683c56dd5c526d21d6b4faae6b42c15091
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Tue Feb 2 20:39:48 2010 -0500

    ws

commit 417ecef44e9729ce4784b6f2ba9e5e26a4e5aee9
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Tue Feb 2 20:25:40 2010 -0500

    Merge branch master into ActiveSync