Merge lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf into lp:zorba

[Chris Hillery]

Restore normal trunk branches for modules.

[Chris Hillery (ceejatec)]

review: Approve

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180220-fix-moduleconf-2013-06-12T00-01-16.384Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1180220-fix-moduleconf-2013-06-12T00-01-16.384Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2013-06-07 05:58:11 +0000
+++ modules/ExternalModules.conf	2013-06-11 23:59:28 +0000
@@ -27,8 +27,7 @@
 #       currently only works for bzr, since svn tags are just different URLS)
 
 archive         bzr  lp:zorba/archive-module          zorba-2.9
-#csv             bzr  lp:zorba/csv-module
-csv             bzr  lp:~zorba-coders/zorba/bug-1180220-util-jvm
+csv             bzr  lp:zorba/csv-module
 data-cleaning   bzr  lp:zorba/data-cleaning-module
 data-formatting bzr  lp:zorba/data-formatting-module
 excel           bzr  lp:zorba/excel-module            zorba-2.9