Merge tag 'sisu_5.8.0' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Sat, 25 Apr 2015 17:50:40 +0000 (13:50 -0400)
committerRalph Amissah <ralph@amissah.com>
Sat, 25 Apr 2015 17:50:40 +0000 (13:50 -0400)
SiSU 5.8.0

Conflicts:
.gitignore
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
data/sisu/v5/v/version.yml
data/sisu/v6/v/version.yml
setup/sisu_version.rb


Trivial merge