Merge branch 'master' into rorcz
commit646ee2aa2e3737b0edb269fd63f71bb66a592b48
authorKyle J. McKay <mackyle@gmail.com>
Sun, 23 Jun 2013 21:17:29 +0000 (23 14:17 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Sun, 23 Jun 2013 21:17:29 +0000 (23 14:17 -0700)
tree9e248504a061d2795fa866cb9c81fbc7209313df
parentc54aa64146717535c3a56703c4086d1de48fb1b2
parent4e380500f2a91fc1282ec092f1cee4954ac7342d
Merge branch 'master' into rorcz
jobd/update.sh