Merge remote branch 'upstream/master' into debian
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Fri, 10 Jun 2011 19:05:30 +0000 (20:05 +0100)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Fri, 10 Jun 2011 19:05:30 +0000 (20:05 +0100)
commit11d6e7cf70670d9735cf94099c7e0e25baeb694c
treee23c33b76fa0a4b60b89a5797385dda4ac51a22b
parent7b91ed9a1fb0505d9ab1001eaa69244bbbd0631d
parent67bdd56aa1df6c76efa0a7af717a2deb6ea5d83e
Merge remote branch 'upstream/master' into debian