Merge remote branch 'upstream/master' into debian
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Wed, 8 Jun 2011 10:32:27 +0000 (11:32 +0100)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Wed, 8 Jun 2011 10:32:27 +0000 (11:32 +0100)
commit42ea6b59bafc188d6d317fcbf04d7504f63bd8b3
tree4a5bf509962f0e32b5465acb94b9e7eed256564e
parent95b31ac36a82ba31b65de9f0a54ae0259742b743
parente922173bdccc7f35ca65c1773db92e08b076fe67
Merge remote branch 'upstream/master' into debian