Bumped debian package to 2.0.0+alpha1-1
Merge branch 'dev' of github.com:GeoNode/geonode
Another version of the alpha debian package
python-django causes more troubles than the ones it solves
Move geonode-rpm repo into main repo
Re-naming RHEL/CentOS packaging dir
Merge pull request #712 from mweisman/master

Move rhel packaging scripts into main repo
work on search
roll back to the correct db name….
clean indentation
Now layer owner can edit it, refs #663
Merge pull request #720 from capooti/issue-663

Now layer owner can edit it, refs #663
Merge branch 'master' of github.com:GeoNode/geonode
alpha1 should be the last change
Updated location of config.yaml in geonode-updateip
Merge pull request #717 from simod/master-search

work on search
Be more clear about the need for sudo in geonode-updateip
Merge branch 'master' of github.com:GeoNode/geonode into dev

Conflicts:
	geonode/search/tests.py
Merge branch 'dev' of github.com:GeoNode/geonode into dev