Merge branch 'master' into wip/side-player

author Frédéric Péters <fpeters@0d.be>

Sat, 28 Sep 2013 12:19:36 +0000 (14:19 +0200)

committer Frédéric Péters <fpeters@0d.be>

Sat, 28 Sep 2013 12:19:36 +0000 (14:19 +0200)
author Frédéric Péters <fpeters@0d.be>
Sat, 28 Sep 2013 12:19:36 +0000 (14:19 +0200)
committer Frédéric Péters <fpeters@0d.be>
Sat, 28 Sep 2013 12:19:36 +0000 (14:19 +0200)
diff --cc panikweb_templates/static/js/specifics.js
Simple merge
author	Frédéric Péters <fpeters@0d.be>
	Sat, 28 Sep 2013 12:19:36 +0000 (14:19 +0200)
committer	Frédéric Péters <fpeters@0d.be>
	Sat, 28 Sep 2013 12:19:36 +0000 (14:19 +0200)