From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 27 Mar 2015 18:10:54 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=0a8209edec6578ec0c2e6fbc1f6462b1de75b72c;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	app.psgi
	log.conf
---

0a8209edec6578ec0c2e6fbc1f6462b1de75b72c
diff --cc log.conf
index a0f2bda,1f31323..dbde8c9
--- a/log.conf
+++ b/log.conf
@@@ -1,5 -1,4 +1,4 @@@
 -log4perl.category. = TRACE,
 +log4perl.category. = TRACE, stderr
- log4perl.category.access = INFO, accesslog
  
  log4perl.appender.stderr                          = Log::Log4perl::Appender::Screen
  log4perl.appender.stderr.layout                   = Log::Log4perl::Layout::PatternLayout