Merging "omf" branch into "default".
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 21 Feb 2013 09:53:29 +0000 (10:53 +0100)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 21 Feb 2013 09:53:29 +0000 (10:53 +0100)
commit7faf58df75bda4fab764b9ef855e95a485d750d1
tree11e2523a2312d87b620f4183b2d1bae5d8ef2b6e
parent1b5b6ca05e10d2a555b1bcbe4ca96bac08802c06
parent6ae490f8eb6b19a30996a2df023ca87b5bcaf9e9
Merging "omf" branch into "default".