merged from donkult
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 26 Jun 2012 11:49:55 +0000 (13:49 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 26 Jun 2012 11:49:55 +0000 (13:49 +0200)
commit826c34198609fc92ca6deeb99104ecc8d4a7b706
tree9ccb17771f93d39668075c12a9abd648e276edce
parentaf596e0c7c99f5313930b84d107c4ccf253374f3
parent0219b908336da7fd108ee889be9a30ab034dedfc
merged from donkult