Merge branch 'master' into signature

2cb1d7c6 · Łukasz Nowak · 530618f6 · eb62cbce · 2cb1d7c6 · 2cb1d7c6
Commit 2cb1d7c6 authored Aug 09, 2011 by Łukasz Nowak
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

CHANGES.txt CHANGES.txt +6 -1

setup.py setup.py +1 -1

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======

-0.3 (unreleased)
+0.4 (unreleased)
 ----------------

 * No changes yet.

+0.3 (2011-08-03)
+----------------
+
+ * Deal with proxy in correct way [Sebastien Robin]
+
 0.2 (2011-07-01)
 ----------------


--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os

 name = "slapos.libnetworkcache"
-version = '0.3-dev'
+version = '0.4-dev'


 def read(*rnames):