Calen Pennington 34a696cdf6 Merge branch 'master' into cpennington/cms ...

Conflicts:
	rakefile
	requirements.txt

2012-06-18 13:46:33 -04:00

..

dogfood

add README.md for dogfood

2012-06-13 10:18:54 -04:00

loncapa

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

newrelic_logging

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

perfstats

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

symmath

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

pipeline_mako.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

static_replace.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00