Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi
authorAlicia FLOREZ <alicflorez@gmail.com>
Thu, 23 May 2013 15:45:18 +0000 (17:45 +0200)
committerAlicia FLOREZ <alicflorez@gmail.com>
Thu, 23 May 2013 15:45:18 +0000 (17:45 +0200)
commit682e7d5e5f605d293f2e42c609f5dfc675bbe6e0
tree0303be158bf7abc6f7f9992ada11ae97219e8411
parentac740e857b6773a5660f18f1eb0707bed957c2c3
parent1a62f57084eaea2cfee18ae31bd81451305f2389
Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi
projet.py