Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 19 Nov 2012 15:06:01 +0000 (15:06 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 19 Nov 2012 15:06:01 +0000 (15:06 +0000)
commit29e407e589d3ac8f3bc5cd82cfd829d994919d2a
treead94302b3bf84fa9d7dc0abe6961b6362095ef14
parent4f68526c56f2fcdb5ba98724d08fa4dd86a65a11
parentca2888cfa95a644f54c86fd954c3cd6d82c6efb9
Merge branch 'devel' into debian-devel