Merge branch 'master' into rorcz
commit6e8036392c942df5e227c2fdac18c496ab21caa1
authorKyle J. McKay <mackyle@gmail.com>
Sat, 23 Aug 2014 23:53:10 +0000 (23 16:53 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Sat, 23 Aug 2014 23:53:10 +0000 (23 16:53 -0700)
treeb71697ca4217ee1bcbca465df54894a74f178721
parent366e09cf801f2474a2fb71713bfa8a8ad81b979b
parentea5f7a3135848fc5009659ff1448b70183a26117
Merge branch 'master' into rorcz