Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11879] Replace .live() with .on()

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js
This commit is contained in:
Andreas Fischer 2013-10-02 15:01:13 +02:00
commit f5676fab3c

Diff content is not available