[pkg-horde] [SCM] Debian Horde Packages repository: imp4 package branch, upstream+repack, updated. 1a6f257d4ffb785bfe9804d234d479f3ca0b3b17

[Gregory Colpart]

The following commit has been merged in the upstream+repack branch:
commit 1a6f257d4ffb785bfe9804d234d479f3ca0b3b17
Merge: b22a5e285e94a09cc2e68780ed823c03c558e1a8 759effd3134dd3345605360bebd6dacf587e6ea4
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Tue Oct 20 02:21:06 2009 +0200

    Merge branch 'upstream' into upstream+repack
    
    Conflicts resolved:
    	js/prototype.js
    	js/src/prototype.js


-- 
Debian Horde Packages repository: imp4 package