Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Thu, 30 Jun 2011 15:51:52 +0000 (17:51 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 30 Jun 2011 15:51:52 +0000 (17:51 +0200)
commitdd51c3633644b31a10de777ed839336edc61c27b
tree9a5676b5f7ec0c50507a0f59bd7a2d0757f1f0d8
parent7c97fb5aa9492cabdf69ded476e41f2809678b79
parent904ae4a9968a1d23d78360b4413184cf1a88d4f9
Merge branch 'master' into erp5