| commit | 09baccdd575b55927645951a2f7a42eae13174d8 | [log] [tgz] |
|---|---|---|
| author | Marcel Kinard <cmarcelk@gmail.com> | Fri Sep 05 15:41:31 2014 -0400 |
| committer | Marcel Kinard <cmarcelk@gmail.com> | Fri Sep 05 15:41:31 2014 -0400 |
| tree | 974e1549c5b1bc4613b4b5cf0de49f642976fba0 | |
| parent | 15903109c984d7543bb356e39e42bcf36a55083d [diff] | |
| parent | f2a8088cf1db732b8451aded698502e37eeb5502 [diff] |
Merge branch 'master' into 3.6.x Conflicts: VERSION
diff --git a/VERSION b/VERSION index a4ce38e..9575d51 100644 --- a/VERSION +++ b/VERSION
@@ -1 +1 @@ -3.7.0-dev +3.6.1