Merge branch 'release/staging' into develop

Conflicts: doc/API.md
2012-10-30 13:14:42 +01:00 · 2012-10-30 13:14:42 +01:00 · d3760b1d7a
commit d3760b1d7a
parent 9aa28c5bea 311262c2ad
1 changed files with 2 additions and 1 deletions
--- a/NEWS.md
+++ b/NEWS.md
@ -1,4 +1,4 @@
-1.1.0 (DD/MM/YY)
+1.1.0 (30/10/12)
 -----
 * New output formats:
  * ESRI Shapefile (format=shp)
@ -15,6 +15,7 @@
  - Interactive mode
 * API documentation
 * ./configure script
+* Restrict listening to a node host

 1.0.0 (03/10/12)
 -----