Merge branch 'upstream'
commitaa4d942dbafe1b9ad3b0d49230bc7e546bd90a28
authorygrek <ygrek@autistici.org>
Wed, 18 Aug 2010 20:12:16 +0000 (18 23:12 +0300)
committerygrek <ygrek@autistici.org>
Wed, 18 Aug 2010 20:12:16 +0000 (18 23:12 +0300)
treedac1bab76055f3f1de85fa2f4228692624092e7e
parent943cea52c1944f419ee17015f76f13ad1ca797f0
parentc14d5a25aaeb1a202a513025ceb4c2aac2d57bc7
Merge branch 'upstream'