Merge pull request #238 from fmms/checkstyle04

author Thomas Müller <thomas.mueller@tmit.eu>

Sun, 4 Nov 2012 16:59:45 +0000 (08:59 -0800)

committer Thomas Müller <thomas.mueller@tmit.eu>

Sun, 4 Nov 2012 16:59:45 +0000 (08:59 -0800)
author Thomas Müller <thomas.mueller@tmit.eu>
Sun, 4 Nov 2012 16:59:45 +0000 (08:59 -0800)
committer Thomas Müller <thomas.mueller@tmit.eu>
Sun, 4 Nov 2012 16:59:45 +0000 (08:59 -0800)
diff --cc lib/base.php
Simple merge
diff --cc lib/template.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Sun, 4 Nov 2012 16:59:45 +0000 (08:59 -0800)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Sun, 4 Nov 2012 16:59:45 +0000 (08:59 -0800)
		1	2
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/template.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history