Merge remote-tracking branch 'upstream/devel' into devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 10:21:14 +0000 (10:21 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 10:21:14 +0000 (10:21 +0000)
commit634a5e1e7183ceec457e5ec84123a74f279b3782
tree312936d8d952ce6600e127610d6ed6deabec6816
parentd6b37022483c32492cb6417e0827159373e0b4d2
parent5fd35879cd2fd3267728be3a2f3c13bb133ad719
Merge remote-tracking branch 'upstream/devel' into devel