Merge branch 'import_plugin_fixes' into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 1 Mar 2012 16:55:33 +0000 (17:55 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 1 Mar 2012 16:55:33 +0000 (17:55 +0100)
commit54087c20bbc49af095296e5bc2d7ae0af45da828
tree6084a927191530d1b3c303d73c5ecd65ca7043e6
parent682fa3672f330016ff80834f18f7ae0a9f493d96
parentecc0efed20a31db655494072b9854936110741c3
Merge branch 'import_plugin_fixes' into devel