Merge branch 'devel' into import_fixes
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 29 Mar 2012 12:16:32 +0000 (14:16 +0200)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 29 Mar 2012 12:16:32 +0000 (14:16 +0200)
commit93f29741a0364461422506c73c09b583452bc914
tree58116bd61f0129506a3feee9b3b79de76d655735
parent85af31eab1d8e5c5b70d08070315ac709592e4b8
parent5b54f7a9ff2e01beaef04f5439abdbae4a83ec41
Merge branch 'devel' into import_fixes