From: Brian Aker <brian@tangent.org>
Date: Fri, 22 Jul 2011 06:34:10 +0000 (-0700)
Subject: Just testing merge
X-Git-Tag: 0.51^2^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6953f8c1a076b300fe0658a4b82cb835110699d0;p=m6w6%2Flibmemcached

Just testing merge
---

diff --git a/docs/conf.py.in b/docs/conf.py.in
index c27cd5c2..a8adeaa0 100644
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -22,6 +22,7 @@ import sys, os
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
+# comment left to test merge
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.