Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 11:21:36 +0000 (11:21 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 11:21:36 +0000 (11:21 +0000)
commit89a9ca093d74841f9bd8e414fdb9f65f468a32f4
tree0acfe1d543522daebaf8577920f07472c2c6678d
parent72c0b43dd4172d61bc24b933b6ddb771e8255065
parentd6b37022483c32492cb6417e0827159373e0b4d2
Merge branch 'devel' into debian-devel