Merge branch 'topic/conflicting_upstream_deps'
authorKaren Etheridge <ether@cpan.org>
Thu, 13 Jun 2013 21:44:33 +0000 (14:44 -0700)
committerKaren Etheridge <ether@cpan.org>
Thu, 13 Jun 2013 21:44:33 +0000 (14:44 -0700)
commit399c975b323e0a910a881edeb63c01d3526598fc
tree7d51312dff93353cc6c0a02713164f20f5df3076
parent3ae86463087474f90b33f27d480b319340ca08ff
parent27073f7c6af8ee1299243d8f1e6f98931474f755
Merge branch 'topic/conflicting_upstream_deps'

We now have conflict tracking! Please keep it up to date when an issue is observed.