merge changelog-2.1 back into main changelog

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

docs/changelog

@@ -4,6 +4,18 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+
+2.1.0pre1:
+	* Core: Removed obsolete variable __self
+	* Removed type __addifnosuchline (replaced by __line)
+	* Removed type __removeline (replaced by __line)
+	* Type __directory: Parameter --parents and --recursive are now boolean
+	* Type __package_apt, __package_luarocks, __package_opkg,
+		__package_pacman, __package_pkg_freebsd, __package_pkg_openbsd,
+		__package_rubygem, __package_yum, __process:
+			Parameter state accepts only "present" and "absent"
+	* Initial support for pypi packaging
+
 2.0.15:
 	* Core: Make variable __object_name available in type explorers (Steven Armtrong)
 	* New Type: __qemu_img

docs/changelog-2.1

@@ -1,15 +0,0 @@
-Changelog (v2.1 specific)
--------------------------
-
-	* Changes are always commented with their author in (braces)
-	* Exception: No braces means author == Nico Schottelius
-
-2.1.0pre1:
-	* Core: Removed obsolete variable __self
-	* Removed type __addifnosuchline (replaced by __line)
-	* Removed type __removeline (replaced by __line)
-	* Type __directory: Parameter --parents and --recursive are now boolean
-	* Type __package_apt, __package_luarocks, __package_opkg,
-		__package_pacman, __package_pkg_freebsd, __package_pkg_openbsd,
-		__package_rubygem, __package_yum, __process:
-			Parameter state accepts only "present" and "absent"