Update complete_lang.php
Merge pull request #2690 from bsh/patch-6

Update translation
Merge pull request #2689 from bsh/patch-5

Update step_1_lang.php
Merge pull request #2688 from bsh/patch-3

Update global_lang.php
Fixes #2663. There can now be multiple keyword fields on a single page.
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of git://github.com/lisatiya/pyrocms into 2.2/develop
Tweaked migration 125 a little.
Tweaked migration 125 a bit and related files.
Added translation files for robots noindex/nofollow.
Replaced module_m with ModuleLocator and ModuleModel
it's still not perfect separation, but its a lot better than having just module_m which magically works out everything. Theme and Widgets are broken, but being worked on now.
Loads of progress getting ThemeManager and ThemeModel into place
IE fix for menu in control panel theme

http://tinypic.com/r/2a9aav9/4
Fixing template plugin functions

Because of the change in the page parse order, the set_title(), etc
functions were not working. This fixes them by adding an override
function that the plugin now uses. See the comments in the template
library for more details.
Improving Streams Pagination

Adding support for query string based pagination.
Merge pull request #2665 from jaoustin/patch-1

Update form_validation_lang.php
Merge pull request #2674 from jchamberlain/2.2/develop

Resolved conflict in datetime's default input_type
Added an event and a server log for failed login attempts
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Fixes an issue with adding files keywords when the site isn't using mod_rewrite