Merge branch 'upstream'

jgoerzen · jgoerzen · commit c73f62a9d835 · 2011-10-21T10:15:28.000-05:00
diff --git a/ConfigFile.cabal b/ConfigFile.cabal
@@ -1,5 +1,5 @@
 Name: ConfigFile
-Version: 1.0.6
+Version: 1.1.0
 License: LGPL
 Maintainer: John Goerzen <jgoerzen@complete.org>
 Author: John Goerzen
