Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Sun, 20 Jan 2013 11:08:17 +0000 (11:08 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Sun, 20 Jan 2013 11:08:17 +0000 (11:08 +0000)
commitdb4c4cf75614be21f95361717807cf3fe922f67a
treea4260f92b0b5f44966ab2b58dd2b120afdbf7869
parent9e07137f9b2f9bfe9e4f2f305c38cd47c3df7552
parentab8afb873fd7ff0f1b2672d5e6a94accd812d209
Merge branch 'devel' into debian-devel