Feanil Patel 5e5c59cab2 Merge remote-tracking branch 'origin/release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.

2014-02-03 16:39:40 -05:00

..

calc

298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

2013-11-19 12:52:13 +01:00

capa

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

chem

…

sandbox-packages

…

symmath

Fix pylint/pep8 errors

2013-11-08 11:08:48 -05:00

xmodule

Merge remote-tracking branch 'origin/release'

2014-02-03 16:39:40 -05:00

django_startup.py

Very Minor tweaks to the LMS and CMS startup.

2014-01-02 14:27:52 -05:00

extract_tar.py

Use wrapped tar extraction

2013-10-04 15:47:58 -04:00

html_to_text.py

…

logsettings.py

Remove lms/lib from sys.path in favore of using it as the module lms.lib

2013-11-08 11:08:48 -05:00

rooted_paths.py

…

sample-post.py

…

supertrace.py

…

tempdir.py

…