Merge branch 'master' into rorcz
commit640c49a6c23c4bbbafb04332395a0dd477472db0
authorKyle J. McKay <mackyle@gmail.com>
Sun, 23 Jun 2013 05:26:21 +0000 (22 22:26 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Sun, 23 Jun 2013 05:26:21 +0000 (22 22:26 -0700)
treeec4430efc2152fd26f399ebfd6b08679ae78ea1f
parent02641720af86c869240127220477eda7003e6092
parentd34a42a0a77b3a8ee2cddbe44772d4aebd325bf7
Merge branch 'master' into rorcz
jobd/update.sh