Isaac Connor ca07b951cb Merge branch 'master' into newpointone ... Conflicts: docs/installationguide/ubuntu.rst		2015-12-21 12:41:25 -05:00
..
ubuntu.rst	removed -master from ppa - when 1.29 releases it will be stable	2015-12-18 15:11:05 -05:00