Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 25 Nov 2013 11:16:11 +0000 (11:16 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 25 Nov 2013 11:16:11 +0000 (11:16 +0000)
commita9b08248f4503e4130a528f8df70154825e97a5b
treecd2d30ba6ab8be61fb955375e3112845850d6ddf
parent735f3f56903a89656face81b7eaf8682aac064d0
parent9c3a62659a2626561c2a1850ac6074536c8ea33c
Merge branch 'devel' into debian-devel