Merge remote-tracking branch 'upstream/devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 9 Jun 2014 08:07:44 +0000 (09:07 +0100)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 9 Jun 2014 08:07:44 +0000 (09:07 +0100)
commit1354322661075c1f0826cd9ff4a3393212313dcd
treea5e8b04a82808b0b82e2f8b0922bead9e5912ca5
parent49b7f33f9fa9942c8b402a0a469bff3b9a9cffc0
parent18be91fce70122c5d8cdaa211ac64e276a53f5f1
Merge remote-tracking branch 'upstream/devel' into debian-devel