merged r5695:5814 from branch 3.1:

debian/changelog

@@ -1,3 +1,20 @@
+ngcp-www-admin (3.1.4) unstable; urgency=low
+
+  * added generic rewrite rule sets for subscribers/domains/peers
+  * removed domain/peer rewrite rules and re-added them as a preference
+
+ -- Daniel Tiefnig <dtiefnig@sipwise.com>  Thu, 18 Aug 2011 03:03:17 +0200
+
+ngcp-www-admin (3.1.3) unstable; urgency=low
+
+  * automatically reload apache on package upgrades
+  * removed $self reference from login object, reducing session size
+  * recovered pagination styles and adapted them to new design
+  * better column widths in subscriber view and search listing
+  * fixed "Active Registrations" display
+
+ -- Daniel Tiefnig <dtiefnig@sipwise.com>  Wed, 20 Jul 2011 02:20:50 +0200
+
 ngcp-www-admin (3.1.2) unstable; urgency=low
 
   * syntax checks on rewrite rules