Merge branch 'master' of github.com:wifidog/wifidog-gateway into fix-status-truncation

Conflicts:
	NEWS

Author: acv

NEWS

@@ -1,5 +1,12 @@
 # vim: set noet sw=4 ts=4 :
+
 WiFiDog 1.2.1:
+	* Fix build (#127, #128)
+	* Integrate with Travis CI
+	* Integrate with Coverity Scan
+	* Fix several memory leaks and other potential problems uncovered by
+	  static analysis
+	* Refactor SSL initialization
 	* Fix a truncation issue around 112 clients in the status page. (#47)
 
 WiFiDog 1.2.0:

configure.in

@@ -21,7 +21,7 @@ AC_SUBST(BUILDROOT)
 # we use Semantic Versioning x.y.z tag for release, docs: http://semver.org/
 WIFIDOG_MAJOR_VERSION=1
 WIFIDOG_MINOR_VERSION=2
-WIFIDOG_MICRO_VERSION=0
+WIFIDOG_MICRO_VERSION=1
 WIFIDOG_VERSION=$WIFIDOG_MAJOR_VERSION.$WIFIDOG_MINOR_VERSION.$WIFIDOG_MICRO_VERSION
 
 AC_SUBST(WIFIDOG_MAJOR_VERSION)