Michael DeHaan 78fdedd490 Merge remote branch 'origin' into devel ... Conflicts: library/web_infrastructure/django_manage		2013-06-16 22:15:30 -04:00
..
assemble	DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)	2013-06-15 20:54:25 +02:00
copy	DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)	2013-06-15 20:54:25 +02:00
fetch	Fixup fetch doc formatting.	2013-05-29 10:45:31 -04:00
file	Merge remote branch 'origin' into devel	2013-06-16 22:15:30 -04:00
ini_file	DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)	2013-06-15 20:54:25 +02:00
lineinfile	DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)	2013-06-15 20:54:25 +02:00
template	DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)	2013-06-15 20:54:25 +02:00