Merge branch '0.7.4-release'
authorJeremy Whiting <jpwhiting@kde.org>
Tue, 11 Sep 2012 21:25:56 +0000 (15:25 -0600)
committerJeremy Whiting <jpwhiting@kde.org>
Tue, 11 Sep 2012 21:25:56 +0000 (15:25 -0600)
commit0bec522d26f179be0c5e5d5838b7d9e9b74b397b
treec1e646d6e0b2f7d2f559fc422423f33ab972d19d
parenta7824bab80fab7404edb0dcf8e942f47affc42c2
parentf4e94254af72b03b37d53e27918e792915caa631
Merge branch '0.7.4-release'