Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 11:56:45 +0000 (11:56 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 11:56:45 +0000 (11:56 +0000)
commit4b321c685dc2c0d7f9c6638da90fd4ce4dbb0746
tree8098f78de66c9378e651b5951a15ebad5a5db86f
parent599aff99e99c41de9f81eb90ce3d7bd77e94cef8
parent634a5e1e7183ceec457e5ec84123a74f279b3782
Merge branch 'devel' into debian-devel