Merge branch 'master' into mr-intg
authorZachary Stevens <zts@cryptocracy.com>
Sun, 8 Nov 2009 22:17:14 +0000 (22:17 +0000)
committerZachary Stevens <zts@cryptocracy.com>
Sun, 8 Nov 2009 22:17:14 +0000 (22:17 +0000)
commitc83b95b6db291b5f1aa5891139c29d1b4fe6c82b
treedde0d518f97bc02bcb81b607526b19583bccd811
parentba65bc524eae2d8b065076fed85e7e3d248128b2
parent2328a3cdeae5d90732d63ea481e88cafc783e0a0
Merge branch 'master' into mr-intg

Conflicts:
t/01app.t