Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Mon, 28 Jul 2014 00:15:50 +0000 (20:15 -0400)
committerMark H Weaver <mhw@netris.org>
Mon, 28 Jul 2014 00:15:50 +0000 (20:15 -0400)
commit33690ffde5af2c516bc6b2dd060ab9cf7ab88eb2
treed91daca5084dec6ede304d2c9ff1c376a740e416
parent5c47b06b4370e7d6590b0c75404d694a52897293
parentb9663471a87916f36b50af2a0f885f6f08dc3ed2
Merge branch 'master' into core-updates