Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Fri, 1 Mar 2013 09:58:14 +0000 (09:58 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Fri, 1 Mar 2013 09:58:14 +0000 (09:58 +0000)
commit566d8df3ec5113a6d4bfbc283719fbe448814dd7
tree647c7ffe518f4cc02a081550efb89c4265889e28
parentdb4c4cf75614be21f95361717807cf3fe922f67a
parent318190cdc40e5f5f38c6caba1ddd7fb8825a17d3
Merge branch 'devel' into debian-devel