CRLF will be replaced by LF
Fix incorrect detection of string as php-format by xgettext.

Because of "100%" in the string, xgettext thinks this is a format string. This is wrong, so add the appropriate tag to correct the heuristics.
Merge pull request #779 from vslavik/patch-1

Fix incorrect detection of string as php-format by xgettext.
Version 3.2.0

Conflicts:
	oc-includes/osclass/assets/js/tiny_mce/plugins/ajaxfilemanager/inc/config.base.php
Merge branch 'master' of github.com:osclass/Osclass
Hide "Login" and "Register" links when users are disabled in User Settings

Hide "Login" and "Register" links when users are disabled in User Settings instead of flash message showing "Users not enabled".
Merge pull request #931 from extr/patch-2

Hide "Login" and "Register" links when users are disabled in User Settin...
Update functions.php

End Tag for <img .. /> added.
Merge pull request #970 from hyperion4ever/patch-2

Update functions.php

Thanks for the help
Update reported.php
Merge pull request #980 from gilden-/patch-1

Thanks!
Revert "Merge pull request #980 from gilden-/patch-1"

This reverts commit 20dcd16bd925fd7280a7dc195ea4fd7ace1ab17f, reversing
changes made to fdf92055dd566ed9bb2f7286978041b6db0c40c8.
small fix on market download temp folder
Merge branch 'hotfixes' into develop
fixes on hSearch.php osc_search_url
Merge pull request #1064 from garciademarina/issue-2-1034

fixes on hSearch.php osc_search_url
fixed #1058, clearVariables before redirect
Merge pull request #1065 from garciademarina/issue-1058

Issue 1058 fixed
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'hotfixes' into develop