Merge branch 'issue2'
commita3c65c97d5bb06871e6e4a888e1c1d2ada501cf2
authorygrek <ygrek@autistici.org>
Fri, 8 Jan 2010 15:31:11 +0000 (8 17:31 +0200)
committerygrek <ygrek@autistici.org>
Fri, 8 Jan 2010 15:31:11 +0000 (8 17:31 +0200)
tree6dfe61224d2760446473824d65a4771753916c4e
parent86798534738c2cf9ab5dc83f46c79fb99d8bfa49
parent1343d27ef2d00c6afad8549ad09589ad248bbceb
Merge branch 'issue2'