merged from donkult
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 14 Sep 2011 18:30:15 +0000 (20:30 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 14 Sep 2011 18:30:15 +0000 (20:30 +0200)
commit3e60519c4a2f7baf59553f94700646f4fef4d28d
tree0b5c7deb860eed58c40c472bb62c6fa00e281af6
parentcbfc289d6eb2711ef12033e4eb024befd0b31815
parent75a90b93257ea81d42331c03b56bd6589c62e065
merged from donkult