Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 09:39:19 +0000 (10:39 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 09:39:19 +0000 (10:39 +0100)
commitf5a84e499f1ae37c27edea21a08e71f024d42c63
tree17fb373cfc5a1c3dd955781a17e2fc074c1218e3
parentf967f7719e56d66e55fe5e474af03fb131f1d4b4
parent1650712961976102505f224a9019c15c616feaaf
Merge branch 'master' into erp5