Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 12 Aug 2013 18:48:52 +0000 (20:48 +0200)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 12 Aug 2013 18:48:52 +0000 (20:48 +0200)
commitaea847a2c3331614a9875de43e9470cc9d33fde4
treebc66a1f5df1e8e34515c3dd57e285265c6d84690
parentb7fea638caad8f1e9ef9cf39ed219ca19dba65fb
parentd34cbd8455c69b4a3e97c97fc664d00a3634370c
Merge branch 'devel' into debian-devel