Merge branch 'edsport'
authorJeremy Whiting <jpwhiting@kde.org>
Tue, 12 Jun 2012 16:20:18 +0000 (10:20 -0600)
committerJeremy Whiting <jpwhiting@kde.org>
Tue, 12 Jun 2012 16:20:18 +0000 (10:20 -0600)
commitac852c2c9ffee2f77ff585c5d18a4f86cbfcde34
tree18f468e5eca4b6d1aa16786bc793a7b619bfb29b
parent09b27d0fc9ada08755b852070c0e43da9473a469
parent5b692136dc36f967555a13f933a438ddafdb5770
Merge branch 'edsport'
Reviewed-by: Philip Withnall