Merge the 0.11 and 0.12 branches
|Reported by:||Ryan J Ollos||Owned by:||Ryan J Ollos|
The changes required for 0.12 compatibility were fairly minimal. The 0.11 branch currently does not contain all of the recent fixes that have gone into the 0.12 branch. The 0.11 and 0.12 branches should be merged for ease of maintenance.
The differences are isolated to:
And of course, testing in 0.11 is needed.