]> git.armaanb.net Git - atreides.git/commitdiff
projects / atreides.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 262c685 8a2e0fb)
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)
Update so that I have all the latest changes.


Trivial merge
Descendent of Atreus