Merge branch 'WebImport_branch' of gitorious.org:mldemos/mldemos
authorBasilio <basilio@tsf-wpa-2-0083.epfl.ch>
Tue, 16 Aug 2011 12:02:17 +0000 (14:02 +0200)
committerBasilio <basilio@tsf-wpa-2-0083.epfl.ch>
Tue, 16 Aug 2011 12:02:17 +0000 (14:02 +0200)
commitd86331fe0d1cc12f08792acd451cdda4d4d725f7
treef44ad508a044314a9abac1752e47be5711489f7f
parent66dc50f0c8452043bbd3ae7c053b9b79de868b41
parent43c984d0fefc98272c5f12d84ac8d853b1ab23e8
Merge branch 'WebImport_branch' of gitorious.org:mldemos/mldemos
_IOPlugins/WebImport/WebImport.h