Joas Schilling d252ef3f60 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/12061] Fix keyboard shortcut in firefox

Conflicts:
	phpBB/styles/prosilver/template/overall_footer.html

2013-12-09 01:23:29 +01:00

..

prosilver

Merge branch 'develop-olympus' into develop

2013-12-09 01:23:29 +01:00

subsilver2

Merge remote-tracking branch 'cyberalien/ticket/11969' into develop

2013-12-03 18:29:10 +01:00