Merge branch 'auth_docs'
authorRodney Ewing <ewing.rj@gmail.com>
Fri, 16 Aug 2013 17:24:41 +0000 (10:24 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Fri, 16 Aug 2013 17:24:41 +0000 (10:24 -0700)
commitfb900ef27b65b3d220ce16972593869441b4c82c
tree87cd40ca32c1123703d23ce62c4adecfafb03ee2
parent71b2bee6228164993394f74202e5acd82535c34d
parentd194770dd24c70cf1306d1287ec2cf82f07e2107
Merge branch 'auth_docs'

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