commit a0eb3964c47913418c801df4f2ed1a5088526542 Merge: 31d30bb e7939ff Author: T.C. Hollingsworth <tchollingsworth at gmail.com> Date: Fri Oct 18 16:04:07 2013 -0700 Merge branch 'master' into f19 .gitignore | 1 + libuv.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---