Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Fri, 1 Mar 2013 10:25:35 +0000 (10:25 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Fri, 1 Mar 2013 10:25:35 +0000 (10:25 +0000)
commita2f5bb73df796c757ffb9e7aace77a1c8e6d657c
tree4cb412ebffba17202c7e3b267f31e9ccac4b8541
parent566d8df3ec5113a6d4bfbc283719fbe448814dd7
parent4d43f8d3eadab2e1dbbf305c30cac9dfbaa95b83
Merge branch 'devel' into debian-devel