Merge to 2.2.11a

ChangeLog

@@ -1,3 +1,21 @@
+commit 16bf299b3b9011d151a598ee06e02e6a96f2249d
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Wed Dec 10 15:22:01 2014 -0500
+
+    Version bump for the release
+
+M	Documentation/docinfo.xml
+M	Documentation/includes/global-attributes.asciidoc
+M	Version
+
+commit b8c79664e102abb36ec6e2b978fb7825c0f1841c
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Wed Dec 10 14:24:51 2014 -0500
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit 3c063e04fb6943a5716e3978e49e9dcef3660b77
 Author: Ludovic Marcotte <lmarcotte@inverse.ca>
 Date:   Wed Dec 10 14:24:06 2014 -0500

Documentation/docinfo.xml

@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
 <releaseinfo>Version 2.2.11 - December 2014</releaseinfo>
-<subtitle>for version 2.2.11</subtitle>
-<date>2014-12-09</date>
+<subtitle>for version 2.2.11a</subtitle>
+<date>2014-12-10</date>
 
 <legalnotice>
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>

Documentation/includes/global-attributes.asciidoc

@@ -13,6 +13,6 @@
 
 // TODO have the build system take care of this
 
-:release_version: 2.2.11
+:release_version: 2.2.11a
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:

Version

@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=2
-SUBMINOR_VERSION=11
+SUBMINOR_VERSION=11a