merged master changes
authorJohn Napiorkowski <jjnapiork@cpan.org>
Fri, 3 Oct 2014 21:29:05 +0000 (16:29 -0500)
committerJohn Napiorkowski <jjnapiork@cpan.org>
Fri, 3 Oct 2014 21:29:05 +0000 (16:29 -0500)
commit2287c16e467f91552f2042a2490bf73ecc1bd89e
treea6626bcc1b6344e6fd8187cf035858903ea7daab
parentd047b87bdc9b549ae6c4ee8b798c5e2ce5e1be09
parentc027f9c423216faae741b04092306cae93aefa1e
merged master changes
Changes