Update lib/util.php

getUrlContent should take proxy setting into consideration when not using curl, as well
Revert "fixed max possible upload size for files app in admin screen"

This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a.

Conflicts:
	apps/files/admin.php
only show the max possible upload of 2GB on a 32 bit system.
for a 64 bit system we have no such limitation
refs #856

Conflicts:
	apps/files/templates/admin.php
fix broken console.log in ie8
omit type attribute in script tag to use fallback (text/javascript)
combine ie8 fix with debug check
phpdoc fixes for public api
Merge pull request #945 from owncloud/fix_app_management_in_ie8

since @tanghus and @DeepDiver1975 gave me their :+1: I'll merge this now: Fix app management in ie8
add smtp port configuration option
Merge pull request #1062 from owncloud/fix-1048-master

add smtp port configuration option
add translation call for 'Not enough space available' upload error
fixing undefined variable $l
Merge pull request #975 from irgsmirx/patch-1

Update lib/util.php
Merge pull request #1041 from owncloud/fixing-856-master

Fixing #856 master
[tx-robot] updated from transifex
fixing indent
Check if oc_token cookie exists before trying to use it
also translate 'No file was uploaded. Unknown error'
move $l to top
fix error when wrong dir was specified