Merge branch 'dev' into randomarticle

author Thomas Citharel <tcit@tcit.fr>

Sun, 1 Feb 2015 10:33:41 +0000 (11:33 +0100)

committer Thomas Citharel <tcit@tcit.fr>

Sun, 1 Feb 2015 10:33:41 +0000 (11:33 +0100)
author Thomas Citharel <tcit@tcit.fr>
Sun, 1 Feb 2015 10:33:41 +0000 (11:33 +0100)
committer Thomas Citharel <tcit@tcit.fr>
Sun, 1 Feb 2015 10:33:41 +0000 (11:33 +0100)
diff --cc inc/poche/Poche.class.php
Simple merge
diff --cc themes/baggy/home.twig
Simple merge
diff --cc themes/default/home.twig
Simple merge
author	Thomas Citharel <tcit@tcit.fr>
	Sun, 1 Feb 2015 10:33:41 +0000 (11:33 +0100)
committer	Thomas Citharel <tcit@tcit.fr>
	Sun, 1 Feb 2015 10:33:41 +0000 (11:33 +0100)
		1	2
inc/poche/Poche.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
themes/baggy/home.twig	patch \|	diff1 \|	diff2 \|	blob \| history
themes/default/home.twig	patch \|	diff1 \|	diff2 \|	blob \| history