app.yaml   :-O
Merge remote-tracking branch 'origin/master' into jon
Loader.gif = Transparent
Merge remote-tracking branch 'origin/master' into jon
Ignore this
Merge remote-tracking branch 'origin/master' into jon

Conflicts:
	agdrift/__init__.pyc
	agdrift/agdrift_output.py
IEC with Django Templates
Pre-Merge of Tao into Jon
Tao merge into Jon
Will be over-written
Tao merge into Jon

Dust PDF/HTML Output Fix
Output Page  & PDF Export Formatting
Merge remote-tracking branch 'origin/tao' into jon

Conflicts:
	app.yaml
	dust/dust_tables.py
Fixing dust_output.py
Fixed: dust_output.py
Merge branch 'jon' of https://github.com/puruckertom/ubertool_src into jon

Conflicts:
	dust/dust_output.py
IEC Django Templates Fixed
Merge branch 'master' of https://github.com/puruckertom/ubertool_src

Conflicts:
	generatepdf/generatepdf_picloud/generatepdf.py
	generatepdf/generatepdf_picloud/model.pdf