Merge branch 'slapos' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Jun 2013 09:59:51 +0000 (11:59 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Jun 2013 09:59:51 +0000 (11:59 +0200)
commitc661cae2eae84f5e16ced012e9d8fdff7cb93d9d
tree88b8dcebd4a7460f7b54c23f1d503a40af78e36c
parentd5a61f7fd5e9bee02697b076bb7c1ae3154b2154
parent6d3e2a3df28ad8d4e118b527ee146398c5a3231d
Merge branch 'slapos' into erp5-component