Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 15 Oct 2012 10:15:41 +0000 (11:15 +0100)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 15 Oct 2012 10:15:41 +0000 (11:15 +0100)
commit50d4560043a3931799d7d3ad4c7355278faa8871
treed24f2db34d472a28fcd24d62b5962b7602055982
parent6fbb235b5418235795884b2bcd86a7d1434bda56
parent20982e224c6fc77f2b982566816f75b3aaded1e0
Merge branch 'devel' into debian-devel