Merge remote-tracking branch 'upstream/devel' into devel 4
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 12:06:52 +0000 (12:06 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 12:06:52 +0000 (12:06 +0000)
commitace68d018caebce2ff185ce62611c7eadcff23ae
tree6467dae38490181cfca92c9429a5a83b13b0ec4f
parent634a5e1e7183ceec457e5ec84123a74f279b3782
parent6a914a4e03574f6235269d14b6c55a1a09a3a578
Merge remote-tracking branch 'upstream/devel' into devel