Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi
authorAlicia FLOREZ <alicflorez@gmail.com>
Thu, 23 May 2013 13:03:25 +0000 (15:03 +0200)
committerAlicia FLOREZ <alicflorez@gmail.com>
Thu, 23 May 2013 13:03:25 +0000 (15:03 +0200)
commit131bd926ea29388071d6b5e741e87f8f9570e3ef
tree1c695f6362419bcfe444a15ff2144a0eb6720c8d
parent3627413948d14481dbe0bc09641394f97586a45a
parentf9813b2c5a4e69e23270aca1123390edb84dabe9
Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi