Merge branch 'master' into gtk3
authorPhilip Chimento <philip.chimento@gmail.com>
Sat, 25 Aug 2012 21:01:23 +0000 (23:01 +0200)
committerPhilip Chimento <philip.chimento@gmail.com>
Sat, 25 Aug 2012 21:01:23 +0000 (23:01 +0200)
commit81becb22fdc69e406c685c65b9f55fd514df142b
tree7dd461e5b0e809de32b193e27793b53b32743eac
parent74177812e42bcd5f6abe84270855824163df753d
parentb071c27096d3c99182a38086e93d1e42f27437c8
Merge branch 'master' into gtk3