Merge branch 'master' into development

Conflicts:
	src/common/heap.c
	src/knot/conf/conf.h
	src/knot/server/zones.c
	src/knot/server/zones.h
	src/knotc.8

RELNOTES

+v1.1.3-rc1 - Dec 6, 2012
+------------------------
+
+Bugfixes
+	* Fixed answering DS queries (RRSIGs not together with DS, AA bit 
+          missing).
+	* Fixed setting ARCOUNT in some error responses with EDNS enabled.
+	* Fixed crash when compiling zone zone with NSEC3PARAM but no NSEC3
+	  and semantic checks enabled.
+
+
+v1.1.2 - Nov 21, 2012
+---------------------
+
+Bugfixes
+	* Fixed debug message.
+
+
+v1.1.2-rc1 - Nov 14, 2012
+-------------------------
+
+Bugfixes:
+	* Fixed crash on reload when config contained duplicate zones.
+	* Fixed scheduling of transfers.
+
+
 v1.1.1 - Oct 31, 2012
 ---------------------
 

configure.ac

 #                                               -*- Autoconf -*-
 
 AC_PREREQ([2.60])
-AC_INIT([knot], [1.1.1], [knot-dns@labs.nic.cz])
+AC_INIT([knot], [1.1.3-rc1], [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.5

-.TH "knot.conf" "5" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.1"
+.TH "knot.conf" "5" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.3-rc1"
 .SH "NAME"
 .LP
 .B knot.conf

src/knotc.8

-.TH knotc "8" "October 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.1"
+.TH knotc "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.3-rc1"
 .SH NAME
 .B knotc
 \- Knot DNS control utility

src/knotd.8

-.TH "knotd" "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.1"
+.TH "knotd" "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.3-rc1"
 .SH NAME
 .B knotd
 \- Knot DNS daemon

src/libknot/nameserver/name-server.c

@@ -1713,6 +1713,9 @@ static inline int ns_referral(const knot_node_t *node,
 			
 			ret = ns_put_authority_soa(zone, resp);
 		}
+
+		// This is an authoritative answer, set AA bit
+		knot_response_set_aa(resp);
 		
 		return ret;
 	}