From e6bf033cbd4900a84a46ae5e7d5e87637dcb9510 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 3 Dec 2015 18:13:24 +0100
Subject: [PATCH] bump version

---
 CONTRIBUTORS         | 52 +++++++++++++++++++++++---------------------
 libmproxy/version.py |  2 +-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5389db5fa..bee0e4866 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,5 @@
-  1122	Aldo Cortesi
-   765	Maximilian Hils
+  1124	Aldo Cortesi
+   810	Maximilian Hils
     80	Marcelo Glezer
     48	Thomas Kriechbaumer
     28	Jim Shaver
@@ -10,54 +10,48 @@
     11	Justus Wingert
     11	Stephen Altamirano
     10	András Veres-Szentkirályi
+     9	Chris Czub
      9	Legend Tang
      8	Jason A. Novak
      8	Rouli
      7	Alexis Hildebrandt
      5	Brad Peabody
-     5	Tomaz Muraus
      5	Choongwoo Han
      5	Matthias Urlichs
+     5	Tomaz Muraus
      5	elitest
      5	iroiro123
+     4	Bryan Bishop
      4	Marc Liyanage
+     4	Matthew Shao
      4	Valtteri Virtanen
      4	Wade 524
      4	Youhei Sakurai
      4	root
-     4	Chris Czub
-     4	Bryan Bishop
-     3	Kyle Manna
+     3	Chris Neasbitt
      3	David Weinstein
      3	Eli Shvartsman
-     3	Chris Neasbitt
+     3	Kyle Manna
      3	Zack B
-     2	Rob Wills
-     2	isra17
-     2	israel
-     2	Michael Frister
+     2	Bennett Blodinger
+     2	Colin Bendell
      2	Heikki Hannikainen
-     2	Nick Badger
+     2	Jaime Soriano Pastor
      2	Jim Lloyd
-     2	Terry Long
-     2	Wade Catron
      2	Krzysztof Bielicki
      2	Mark E. Haase
+     2	Michael Frister
+     2	Nick Badger
+     2	Rob Wills
+     2	Terry Long
+     2	Wade Catron
      2	alts
-     2	Bennett Blodinger
-     2	Jaime Soriano Pastor
-     2	Colin Bendell
-     1	joebowbeer
-     1	meeee
-     1	michaeljau
-     1	peralta
-     1	phil plante
-     1	sentient07
-     1	sethp-jive
-     1	vzvu3k6k
+     2	isra17
+     2	israel
      1	Andy Smith
      1	Ben Lerner
      1	Dan Wilbraham
+     1	David Dworken
      1	David Shaw
      1	Doug Lethin
      1	Eric Entzel
@@ -103,3 +97,11 @@
      1	deployable
      1	gecko655
      1	jlhonora
+     1	joebowbeer
+     1	meeee
+     1	michaeljau
+     1	peralta
+     1	phil plante
+     1	sentient07
+     1	sethp-jive
+     1	vzvu3k6k
diff --git a/libmproxy/version.py b/libmproxy/version.py
index 5ed897321..03c2f256b 100644
--- a/libmproxy/version.py
+++ b/libmproxy/version.py
@@ -1,6 +1,6 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 14, 1)
+IVERSION = (0, 15)
 VERSION = ".".join(str(i) for i in IVERSION)
 MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
 NAME = "mitmproxy"