aboutsummaryrefslogtreecommitdiffhomepage
path: root/version
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2013-01-24 22:29:09 -0400
committerGravatar David Bremner <bremner@debian.org>2013-01-24 22:29:09 -0400
commit7264732a794b8d59b0aeef395e74381beb4b90f7 (patch)
tree01211ac9ba91d1f905ba805d56d4d587ec460ee6 /version
parentaa48b23f3823606905cf99edfddc3ff62593cdd8 (diff)
parent79b0829082e62020de6eeb66e0c4f1ad19ded86c (diff)
Merge branch 'release'
Conflicts: NEWS Inserted news from 0.15.1
Diffstat (limited to 'version')
-rw-r--r--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index 2856407c..e815b861 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.15
+0.15.1