Merge branch 'master' into dyn_themes

author Jehan-Guillaume de Rorthais <ioguix@free.fr>

Thu, 2 Jan 2014 12:21:09 +0000 (13:21 +0100)

committer Jehan-Guillaume de Rorthais <ioguix@free.fr>

Thu, 2 Jan 2014 12:21:09 +0000 (13:21 +0100)
author Jehan-Guillaume de Rorthais <ioguix@free.fr>
Thu, 2 Jan 2014 12:21:09 +0000 (13:21 +0100)
committer Jehan-Guillaume de Rorthais <ioguix@free.fr>
Thu, 2 Jan 2014 12:21:09 +0000 (13:21 +0100)
diff --cc classes/Misc.php
Simple merge
diff --cc themes/cappuccino/global.css
Simple merge
diff --cc themes/gotar/global.css
Simple merge
author	Jehan-Guillaume de Rorthais <ioguix@free.fr>
	Thu, 2 Jan 2014 12:21:09 +0000 (13:21 +0100)
committer	Jehan-Guillaume de Rorthais <ioguix@free.fr>
	Thu, 2 Jan 2014 12:21:09 +0000 (13:21 +0100)
		1	2
classes/Misc.php	patch \|	diff1 \|	diff2 \|	blob \| history
themes/cappuccino/global.css	patch \|	diff1 \|	diff2 \|	blob \| history
themes/gotar/global.css	patch \|	diff1 \|	diff2 \|	blob \| history