Merge branch 'upstream'
commit94c8b5ec39b43c8a4b295615d70566ab2c5d1438
authorygrek <ygrek@autistici.org>
Sun, 26 Sep 2010 16:32:02 +0000 (26 19:32 +0300)
committerygrek <ygrek@autistici.org>
Sun, 26 Sep 2010 16:32:02 +0000 (26 19:32 +0300)
tree1030691192c9d9e3ac25a72bcfeee67b10a667bc
parent8819f80af407f6a06f860f57031a9c0834964849
parent1562c4c832815b350f0b01759b3c2a4b59f38c85
Merge branch 'upstream'