From: Rodney Ewing <ewing.rj@gmail.com>
Date: Fri, 16 Aug 2013 17:24:41 +0000 (-0700)
Subject: Merge branch 'auth_docs'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fb900ef27b65b3d220ce16972593869441b4c82c;p=mediagoblin.git

Merge branch 'auth_docs'

Conflicts:
	docs/source/index.rst
---

fb900ef27b65b3d220ce16972593869441b4c82c
diff --cc docs/source/index.rst
index de6c9c0d,723dfaf8..777c4d26
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@@ -74,7 -77,7 +77,8 @@@ This guide covers writing new GNU Media
     pluginwriter/database
     pluginwriter/api
     pluginwriter/tests
 +   pluginwriter/media_type_hooks
+    pluginwriter/authhooks
  
  
  Part 4: Developer's Zone