From 71f8758b81d657cfffc078a4c259e4f3b3eb9ae3 Mon Sep 17 00:00:00 2001
From: Louis Munro <lmunro@inverse.ca>
Date: Wed, 22 Jun 2016 10:02:56 -0400
Subject: [PATCH] Cumulative Changelog update prior to 6.1.1.

---
 ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ff1ac3297fbe..8f53235c18b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 51302f2462ece11f40a21f04a1db6e098c9bcadd
+Author: Louis Munro <lmunro@inverse.ca>
+Date:   Wed Jun 22 10:01:46 2016 -0400
+
+    Versions and changelogs updates prior to 6.1.1.
+
+M	NEWS.asciidoc
+M	addons/packages/packetfence.spec
+M	debian/changelog
+
+commit b2045fad9c9e635da1f2cc3bc5a14cbb0a95ee40
+Author: Derek Wuelfrath <dwuelfrath@inverse.ca>
+Date:   Tue Jun 21 20:04:47 2016 -0400
+
+    Missing from commit 940ece0ff26aae724b83bf2d5512b3dce47fba33
+
+M	raddb/certs/passwords.mk
+
+commit 78ecede10027a9ef08ac55b23fa073e69dbde685
+Author: Louis Munro <lmunro@inverse.ca>
+Date:   Wed Jun 22 09:38:22 2016 -0400
+
+    Fixed missing schema version update statement.
+
+M	db/upgrade-6.0.0-6.1.0.sql
+
+commit 64333fbbbad48bbd04573dad5a4df7d9f962ea96
+Author: Louis Munro <lmunro@inverse.ca>
+Date:   Tue Jun 21 14:20:34 2016 -0400
+
+    Created maintenance/6.1 branch.
+
+M	conf/pf-release
+
+commit 70238764693a7a81f20bed888653e6d9f36ef784
+Author: Louis Munro <lmunro@inverse.ca>
+Date:   Tue Jun 21 11:11:42 2016 -0400
+
+    Changelog as of packetfence-6.1.
+
+M	ChangeLog
+
 commit 26d7c3fe4294e900eecc69bc55d4dbe272e30f66
 Author: Louis Munro <lmunro@inverse.ca>
 Date:   Tue Jun 21 10:47:01 2016 -0400