Merge branch '2.5.x-installer' into saas-dev

This commit is contained in:
Duncan Sommerville 2015-06-17 14:11:30 -04:00
commit 8f59d18f34
11 changed files with 33 additions and 21 deletions