From 7b901f8d3f80224160b5225fe1d88d086daf51fc Mon Sep 17 00:00:00 2001
From: george <rpubaddr0@gmail.com>
Date: Tue, 17 Jun 2014 18:20:23 -0600
Subject: [PATCH] Added back an Oxford comma in dev/env.

---
 docs/dev/env.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dev/env.rst b/docs/dev/env.rst
index 636b151..67b96be 100644
--- a/docs/dev/env.rst
+++ b/docs/dev/env.rst
@@ -161,7 +161,7 @@ It includes integration with pyflakes_, `pylint <http://www.logilab.org/857>`_
 and `rope <http://rope.sourceforge.net/>`_.
 
 Spyder is open-source (free), offers code completion, syntax highlighting,
-a class and function browser and object inspection.
+a class and function browser, and object inspection.
 
 
 WingIDE