aboutsummaryrefslogtreecommitdiff
path: root/version
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-04-27 17:12:16 -0700
committerCarl Worth <cworth@cworth.org>2010-04-27 17:13:47 -0700
commit417274d698b6718621b9f5dec744ab169499f4e3 (patch)
treebebe2f8373f435fc3fcb836e8cb65bc61016b2be /version
parent229292a4b25cc776349ab1c461392a69301733c7 (diff)
parente9e1466b441769f77391080ee8d08ec1afac7a61 (diff)
Merge branch '0.3.x' immediately after the 0.3.1 release
This brings one bug fix into master that was originally applied directly to the 0.3.x branch.
Diffstat (limited to 'version')
-rw-r--r--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index be586341..9e11b32f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.3
+0.3.1