Merge branch 'maint'

guruofquality · guruofquality · commit 106aa49db81d · 2015-12-07T12:24:10.000-08:00
Conflicts:
	blocks/Changelog.txt
	gui/Changelog.txt
	java/Changelog.txt
	library/Changelog.txt
	util/Changelog.txt
diff --git a/Changelog.txt b/Changelog.txt
@@ -6,7 +6,7 @@ Release 0.2.0 (pending)
 - Switch over to the CMake provided FindJNI.cmake
 - Added Java version check >= 1.7 for CMakeLists.txt
 
-Release 0.1.2 (pending)
+Release 0.1.2 (2015-12-07)
 ==========================
 
 - Fix copy-pasta error message in JavaProxyHandle::call()
