Merge remote branch 'openx-public/develop' into develop

Donald Rowe · Donald Rowe · commit 2415e84c623e · 2012-08-28T14:59:05.000-07:00
(just a test merge)
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -85,3 +85,4 @@ if account_id:
 # Log out.
 ox.delete('/a/session')
 ````
+Test
