Merge branch 'master' into CDB-3497

Conflicts: Makefile NEWS
2014-07-29 14:16:52 +02:00
parent 679af1d4a3 a9005dc93c
commit f9ec3c46ee
2 changed files with 8 additions and 3 deletions
@@ -6,6 +6,7 @@ addons:
 before_install:
  - sudo apt-get update
  #- sudo apt-get install -q postgresql-9.3-postgis-2.1
+  - sudo apt-get update
  - sudo apt-get install -q postgresql-server-dev-9.3
  - sudo apt-get install -q postgresql-plpython-9.3
  # Install schema_triggers