Merging opt-3.1 into nepi-3-dev
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Mon, 28 Jul 2014 09:10:48 +0000 (11:10 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Mon, 28 Jul 2014 09:10:48 +0000 (11:10 +0200)
commit0b2ce43bb7573f766bb348117d089e81d2a395ff
tree2d0c1b4982850051944ae02dd2efac1b0804a83f
parent8d02be43605c71c10a0f4055f638856a1369702b
parent76ef9f2f2569384fcd9dfef45a2072e07aade965
Merging opt-3.1 into nepi-3-dev