From af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 21 Feb 2012 20:12:14 +0000
Subject: Merging master into develop

---
 djangorestframework/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'djangorestframework/__init__.py')

diff --git a/djangorestframework/__init__.py b/djangorestframework/__init__.py
index 0aaa2915..efe7f566 100644
--- a/djangorestframework/__init__.py
+++ b/djangorestframework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.3.3-dev'
+__version__ = '0.3.3'
 
 VERSION = __version__  # synonym
-- 
cgit v1.2.3


From 1cde31c86d9423e9b7a7409c2ef2ba7c0500e47f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 25 Feb 2012 18:45:17 +0000
Subject: Massive merge

---
 djangorestframework/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'djangorestframework/__init__.py')

diff --git a/djangorestframework/__init__.py b/djangorestframework/__init__.py
index efe7f566..46dd608f 100644
--- a/djangorestframework/__init__.py
+++ b/djangorestframework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.3.3'
+__version__ = '0.4.0-dev'
 
 VERSION = __version__  # synonym
-- 
cgit v1.2.3


From 21f59162db37c656b4f025cdd8e13cdb9933a4fc Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 29 Aug 2012 20:00:02 +0100
Subject: Probably will be versioned as 2.0.0

---
 djangorestframework/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'djangorestframework/__init__.py')

diff --git a/djangorestframework/__init__.py b/djangorestframework/__init__.py
index 46dd608f..557f5943 100644
--- a/djangorestframework/__init__.py
+++ b/djangorestframework/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.4.0-dev'
+__version__ = '2.0.0'
 
 VERSION = __version__  # synonym
-- 
cgit v1.2.3


From 87dae4d8549c02fa9a57adb3bb876d249dae1f79 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 20 Sep 2012 13:19:43 +0100
Subject: Remove old 'djangorestframework directories

---
 djangorestframework/__init__.py | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 djangorestframework/__init__.py

(limited to 'djangorestframework/__init__.py')

diff --git a/djangorestframework/__init__.py b/djangorestframework/__init__.py
deleted file mode 100644
index 557f5943..00000000
--- a/djangorestframework/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-__version__ = '2.0.0'
-
-VERSION = __version__  # synonym
-- 
cgit v1.2.3