Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 3 Mar 2014 09:00:19 +0000 (09:00 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 3 Mar 2014 09:00:19 +0000 (09:00 +0000)
commit68a0d8edbe3f9b6269e499184e268c3a839b7ecf
treefc27038ce7eebd9c41fc7c76f26e97e19f2ed442
parenta003a50a03963f7490518340000de63626ac195c
parent6b6818912fee718fcb3f18d901623a76676be215
Merge branch 'devel' into debian-devel