Merge branch 'hotfix/1.24.7' into stable

rvm · Dec 1, 2013 · 102bfcd · 102bfcd
2 parents 22b9861 + 6994739
commit 102bfcd
Show file tree

Hide file tree

Showing 14 changed files with 777 additions and 683 deletions.
diff --git a/LICENCE b/LICENCE
@@ -1,4 +1,5 @@
 Copyright (c) 2009-2011 Wayne E. Seguin
+Copyright (c) 2011-2014 Michal Papis
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.24.6
+1.24.7