Merge branch 'WebImport_branch' into HEAD
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Wed, 10 Aug 2011 21:18:21 +0000 (23:18 +0200)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Wed, 10 Aug 2011 21:18:21 +0000 (23:18 +0200)
commitc08db3799abd0a034e6d702e4653cf0ef8f1fa9d
treee63af58a33e9709becb995fd9c88fef0f7866a7d
parentf0a2d2d4fae3f9ed0a2f0904df9e4acf8381e46f
parent6c705d4cb5335ee5d21fbd9f17b63a7f9667e089
Merge branch 'WebImport_branch' into HEAD