Merge remote branch 'upstream/master' into debian
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Thu, 23 Jun 2011 23:03:58 +0000 (00:03 +0100)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Thu, 23 Jun 2011 23:03:58 +0000 (00:03 +0100)
commitfc02ad0884ac31b66d4f02b9239ed3cc2f78e2f5
tree6be541a37f82b1a13c825b30e72678db34cd98e3
parent95c75a98cedd261188548a87ffa1406336444f10
parent0e817a4b6855f46028de2b269d690b2dc0796a6a
Merge remote branch 'upstream/master' into debian