Merge branch 'master' into f20

Conflicts:
	.gitignore
	sources
	vertica-python.spec

.gitignore

@@ -3,3 +3,4 @@
 /0.2.3.tar.gz
 /v0.3.0.tar.gz
 /0.3.4.tar.gz
+/v0.3.5.tar.gz

sources

@@ -1 +1 @@
-0ac26d4f59b5445511403e17baddf923  0.3.4.tar.gz
+ed69b33840126b005b9e8da9c9784f64  v0.3.5.tar.gz

vertica-python.spec

@@ -2,14 +2,18 @@
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           vertica-python
+<<<<<<< HEAD
 Version:        0.3.4
+=======
+Version:        0.3.5
+>>>>>>> master
 Release:        1%{?dist}
 Summary:        A native Python adapter for the Vertica database
 
 Group:          Development/Languages
 License:        MIT
 URL:            https://github.com/uber/vertica-python
-Source0:        https://github.com/uber/vertica-python/archive/%{version}.tar.gz
+Source0:        https://github.com/uber/vertica-python/archive/v%{version}.tar.gz
 # EPEL 6 patch
 Patch0:         vertica-python-0.2.0-dateutil15.patch
 
@@ -57,8 +61,11 @@ vertica-python is a native Python adapter for the Vertica
 
 
 %changelog
+* Wed Apr 08 2015 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.3.5-1
+- update to version 0.3.5
+
 * Wed Jan 21 2015 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.3.4-1
-- update to version 0.3.3
+- update to version 0.3.4
 
 * Wed Oct 15 2014 Jakub Jedelsky <jakub.jedelsky@gooddata.com> - 0.3.0-1
 - update to version 0.3.0
@@ -66,6 +73,12 @@ vertica-python is a native Python adapter for the Vertica
 * Fri Jun 13 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.3-1
 - update to new version
 
+<<<<<<< HEAD
+=======
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+>>>>>>> master
 * Thu Apr 24 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.1-1
 - new version update