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)
commitaeb7754510ffacc207b17e5d7512ff5f14debcc3
treee2f17e3ad2ee4e1ea81287febe5049ce6fb82147
parent50c16e307e865717acf8e84d470086bd41fb244a
parente0edf0e77589a2f6db67352dba7775b5e45a446b
Merge tag 'sisu_5.8.0' into debian/sid

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