Merge branch 'master' into development

Conflicts:
	man/knot.conf.5in
	man/knotc.8in
	man/knotd.8in
	src/knot/conf/conf.c

RELNOTES

+v1.2.0 - Mar 29, 2013
+---------------------
+
+Bugfixes:
+	* Memory leaks
+
 v1.2.0-rc4 - Mar 22, 2013
 -------------------------
 

configure.ac

 #                                               -*- Autoconf -*-
 
 AC_PREREQ([2.60])
-AC_INIT([knot], [1.2.0-rc4], [knot-dns@labs.nic.cz])
+AC_INIT([knot], [1.2.0], [knot-dns@labs.nic.cz])
 AM_INIT_AUTOMAKE([gnu -Wall -Werror])
 AC_CONFIG_SRCDIR([src/knot/main.c])
 AC_CONFIG_HEADERS([src/config.h])

src/knot/conf/conf.c

@@ -500,6 +500,7 @@ conf_t *conf_new(const char* path)
 	c->uid = -1;
 	c->gid = -1;
 	c->xfers = -1;
+	c->rrl_slip = -1;
 	c->build_diffs = 0; /* Disable by default. */
 	
 	/* ACLs. */