From 667484b3266a4cf76da1ea7fd4d5f5cbeb3206a4 Mon Sep 17 00:00:00 2001
From: kload <kload@kload.fr>
Date: Sun, 15 Feb 2015 13:10:17 +0100
Subject: [PATCH] merge

---
 debian/changelog | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ad318fb..fe40a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-ssowat (2.1.1) testing; urgency=low
+ssowat (2.1.2) testing; urgency=low
+
+  * [enh] Finish documenting the code
+  * [fix] Load modules as proper modules + typo
+
+ -- kload <kload@kload.fr>  Sun, 15 Feb 2015 13:08:34 +0100
+
+ssowat (2.1.1) unstable; urgency=low
 
   * Bump version to 2.1.1 to bootstrap new build workflow