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)

Trivial merge