Merge branch 'master' into newmc

author Marius Gavrilescu <marius@ieval.ro>

Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)

committer Marius Gavrilescu <marius@ieval.ro>

Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
author Marius Gavrilescu <marius@ieval.ro>
Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
committer Marius Gavrilescu <marius@ieval.ro>
Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
diff --cc js/90-themes.js
Simple merge
diff --cc tmpl/skel.en
Simple merge
author	Marius Gavrilescu <marius@ieval.ro>
	Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
committer	Marius Gavrilescu <marius@ieval.ro>
	Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
		1	2
js/90-themes.js	patch \|	diff1 \|	diff2 \|	blob \| history
tmpl/skel.en	patch \|	diff1 \|	diff2 \|	blob \| history