[python-django-sahara/el6-icehouse: 3/3] Merge branch 'el6' into el6-icehouse

[Rex Dieter]

commit dfefe7308b1482b34f07ee30458e6e25b0596c02
Merge: 4d78860 5bdf429
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue May 6 09:12:17 2014 -0500

    Merge branch 'el6' into el6-icehouse
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore                |    2 -
 dead.package              |    1 +
 python-django-sahara.spec |  100 ---------------------------------------------
 sources                   |    1 -
 4 files changed, 1 insertions(+), 103 deletions(-)
---