From: Alicia FLOREZ Date: Thu, 23 May 2013 13:03:25 +0000 (+0200) Subject: Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi X-Git-Url: http://git.inspyration.org/?p=OpenERP%2Fcmmi.git;a=commitdiff_plain;h=131bd926ea29388071d6b5e741e87f8f9570e3ef Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi --- 131bd926ea29388071d6b5e741e87f8f9570e3ef