Merge remote-tracking branch 'upstream/devel'
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Thu, 16 Feb 2012 11:42:18 +0000 (11:42 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Thu, 16 Feb 2012 11:42:18 +0000 (11:42 +0000)
commit4674aefa6f61467167a8b9fe0d437e300f0c1266
tree228458e255713de80e3ef4347116b987deb29501
parent9df4b505908d68d79b0bf4018078163c9e54d102
parenta809e4c4a9a2f5c2006fae15d92d8c7c7a6f9aec
Merge remote-tracking branch 'upstream/devel'