commit 329372c1a1bc277ed1b234a9a699bf1e391b715d Merge: 6da566f 4424244 Author: T.C. Hollingsworth <tchollingsworth at gmail.com> Date: Sun Apr 14 19:01:25 2013 -0700 Merge branch 'master' into f18 .gitignore | 1 + libuv.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) ---