# HG changeset patch
# User bsw
# Date 1415642541 -3600
# Node ID b9364e1b79942c2ddd5c54ebe56863b92f27e98d
# Parent  f41b584efaf4a9bdb1e208262c07cdc6f9d353e7# Parent  d15f1b9e448273f316e10e0a2c6de65ab58be2ec
merge

diff -r f41b584efaf4 -r b9364e1b7994 .hgtags
--- a/.hgtags	Mon Nov 10 18:57:49 2014 +0100
+++ b/.hgtags	Mon Nov 10 19:02:21 2014 +0100
@@ -108,6 +108,7 @@
 046c030978811d2ed07284ced5418cbb55a7b11c v2.2.4
 aa6ed1b9929735320178f28901f0dafad8e14bd4 v2.2.5
 68d91f47bb9814852ffc68b5fdac9c028999b841 v2.2.6
+8fb4eab439c12f269844312a4b52ece5ee1029a6 v2.2.7
 297d34ddd9dcf3c238cd9dceab139b43d48cc5a2 v3.0.0
 9817055e792bc31e4d5a2458658696b83b737627 v3.0.1
 86073b9999dc82e0eff483249389a331c3edea97 v3.0.2
diff -r f41b584efaf4 -r b9364e1b7994 app/main/_filter/21_auth.lua
diff -r f41b584efaf4 -r b9364e1b7994 config/init.lua