Missing user
 # [#30945] Wrong error when folder creation not possible due to
permissions. Thanks Phil Taylor
[#30994] Untranslated String
Update en-GB.com_templates.ini

update en-GB.com_templates.ini for #31032

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=31032
Update categories.php

add delete() function for #31039 (Thanks Julien Celle)

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_id=8103&tracker_item_id=31039
Merge pull request #1203 from zero-24/patch-14

Update categories.php
Merge pull request #1197 from zero-24/patch-12

Update en-GB.com_templates.ini
Change Travis config so that 2.5 is fully ignored
 + [#31106] Added Belgian flag for mod_languages. Thanks Fonny Smets
 # [#31108] Fatal erorr right after install. Thanks Klas and Michael
Babker
(Fix #1245)
 # [#31120] [2.5] *plug-in manager search give errors and warning for
'/','*' and '\
# [#30354] Invalid Javascript Redirect in JApplication::redirect() when
headers have already been sent. Thanks Ben Tasker.
(Fix #868)
 $ [#26548] [patch] incorrect error check in menus.php. Thanks Rob
Clayburn and Ben Tasker
(Fix #1011)
 # [#30150] com_content loads articles before error checking. Thanks
Richard McDaniel.
Merge remote-tracking branch 'remotes/upstream/2.5.x' into patch-9-25