# HG changeset patch
# User rougeronj
# Date 1416582942 -3600
# Node ID c74b7a4a23fa1ea08450c893d124327d04287830
# Parent  c70c34166758a51e5c7170c46042397cd4ce831e# Parent  0599578a8cb92237fed31d14db6cc862f67a198a
Merge with 0599578a8cb92237fed31d14db6cc862f67a198a

diff -r c70c34166758 -r c74b7a4a23fa .hgtags
--- a/.hgtags	Fri Nov 21 16:10:54 2014 +0100
+++ b/.hgtags	Fri Nov 21 16:15:42 2014 +0100
@@ -76,3 +76,4 @@
 bf1198bc533bb05ff09a7287183fc19a9f800b29 V03.00-alpha.01
 bf1198bc533bb05ff09a7287183fc19a9f800b29 V03.00-alpha.01
 a1b85604132c732e2cac932972efd5c85df008ed V03.00-alpha.01
+7f0540d0436ac9894a8f07efe57667b60e4f4297 V03.00-alpha.02
diff -r c70c34166758 -r c74b7a4a23fa src/hdalab/__init__.py
--- a/src/hdalab/__init__.py	Fri Nov 21 16:10:54 2014 +0100
+++ b/src/hdalab/__init__.py	Fri Nov 21 16:15:42 2014 +0100
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (3, 0, 0, "alpha", 1)
+VERSION = (3, 0, 0, "alpha", 2)
 
 
 def get_version():