Merge branch 'master' into trinidad

2015-01-01 21:48:40 -08:00 · 2015-01-01 21:48:40 -08:00 · 9a34e18319
commit 9a34e18319
parent 0a18ea58c6 0286c5a35b
1 changed files with 1 additions and 1 deletions
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2014-12-29.904
+2015-01-01.906