Merge branch 'master' into el6
Mark McLoughlin • 12 years ago  
Update version to diablo final
Mark McLoughlin • 12 years ago