Merge branch 'master' into rorcz
commitcef6f00a63297fffb1fb3ab9f488eb51903af0c2
authorKyle J. McKay <mackyle@gmail.com>
Fri, 27 Dec 2013 04:34:00 +0000 (26 20:34 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Fri, 27 Dec 2013 04:34:00 +0000 (26 20:34 -0800)
tree625cf9b4d62bd31cc32519c9c1f09545b01f900f
parente4b5431130a11352ece8e9db441a5dd7f4cc14f4
parent820f2bd5ba2da9ca80db16cc226894a1da2a69c4
Merge branch 'master' into rorcz
jobd/update.sh