Merge branch 'develop' into refresh

Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
This commit is contained in:
Luke Rogers 2013-11-27 16:55:04 +13:00
commit aa8ab33ccb
31 changed files with 113 additions and 86 deletions

View file

@ -1,4 +1,5 @@
import http, web
import http
import web
def eval_py(code, paste_multiline=True):