Merge remote-tracking branch 'origin/v1.1.x'

mdboom · mdboom · commit b1be20c5c396 · 2012-05-14T11:00:48.000-04:00
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
@@ -569,7 +569,3 @@ contributed by private companies.  The final reason behind the
 licensing choice is compatibility with the other python extensions for
 scientific computing: ipython, numpy, scipy, the enthought tool suite
 and python itself are all distributed under BSD compatible licenses.
-The other reason is licensing compatibility with the other python
-extensions for scientific computing: ipython, numpy, scipy, the
-enthought tool suite and python itself are all distributed under BSD
-compatible licenses.
