commit b52e5eb608091df8186c9507e65a6b990e8cfc03 parent 1ffc6f06438e2330c341c1d8204e14c78c7523ed Author: Felicitus <felicitus@felicitus.org> Date: Mon, 2 Jul 2012 18:54:22 +0200 Merge branch 'extjs-41' Conflicts: src/frontend/index.php Diff is too large, output suppressed.