Merge branch 'upstream'
commit170e1805cb6149041109f396976852164dc9ca1e
authorygrek <ygrek@autistici.org>
Thu, 2 Dec 2010 21:24:35 +0000 (2 23:24 +0200)
committerygrek <ygrek@autistici.org>
Thu, 2 Dec 2010 21:24:35 +0000 (2 23:24 +0200)
tree661d3ecdf9321da14db97a7ebf20e6dc5fbd79bf
parent5dd3ba64d68eaa5dda98949cabbc4aab7dd65058
parentdddbe68ed6ae89680678d4636a6c9af0875a65ab
Merge branch 'upstream'