Merge remote-tracking branch 'origin/erp5-component-z2.13' into erp5-component
authorJulien Muchembled <jm@nexedi.com>
Mon, 15 Jul 2013 17:26:21 +0000 (19:26 +0200)
committerJulien Muchembled <jm@nexedi.com>
Mon, 15 Jul 2013 17:26:21 +0000 (19:26 +0200)
commitd3245ed2effa295312c18cc8320dab76080c13b6
treea27554894f7dadfc897143ad6933ac89a01555cc
parentd7c148520d2aee9c3414891e2bdd2aa2488d3c86
parentf3f1119c92b3c17ec6cf0c608ec4b9bf7434c294
Merge remote-tracking branch 'origin/erp5-component-z2.13' into erp5-component