]> git.armaanb.net Git - atreides.git/commit
Merge remote-tracking branch 'technomancy/master'
authorConstantine Khroulev <ckhroulev@alaska.edu>
Fri, 16 May 2014 00:25:56 +0000 (16:25 -0800)
committerConstantine Khroulev <ckhroulev@alaska.edu>
Fri, 16 May 2014 00:25:56 +0000 (16:25 -0800)
commit3b2d9393e86d853972869b56327991752e6d9e5a
tree1b1e20df67fb639fbfc4cd474db07a42e9e8cad4
parent262c6857f4abfa462b3a7d36bd6e2029fdc843ac
parent8a2e0fb2ab76a1a16934afb3375f15d22f42bbb3
Merge remote-tracking branch 'technomancy/master'

Update so that I have all the latest changes.