Just testing merge
authorBrian Aker <brian@tangent.org>
Fri, 22 Jul 2011 06:34:10 +0000 (23:34 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 22 Jul 2011 06:34:10 +0000 (23:34 -0700)
commit6953f8c1a076b300fe0658a4b82cb835110699d0
tree5dde09aee087271222d09bbe091e7f88ad428ed8
parent0c4746f7e2cb8cafde95f92728cbd4c3f8d72c18
Just testing merge
docs/conf.py.in