merging the nepi-3.0-pre-release branch with nepi-3-dev
authorJulien Tribino <julien.tribino@inria.fr>
Fri, 6 Dec 2013 18:36:44 +0000 (19:36 +0100)
committerJulien Tribino <julien.tribino@inria.fr>
Fri, 6 Dec 2013 18:36:44 +0000 (19:36 +0100)
commitd662dcbab5a504791e306489dde627dde9221fd1
tree917e2ba50a0b677608fd0768313b5ad0abf4ca61
parent16b00f15bf8a2364cd7a3bb7b62035064059df16
parent82cf9668b586573e32ccd8e7c582230790a1406f
merging the nepi-3.0-pre-release branch with nepi-3-dev