Update some conflicts to get people to install versions of MX modules that work with...
authorDave Rolsky <autarch@urth.org>
Mon, 4 Apr 2011 02:16:08 +0000 (21:16 -0500)
committerDave Rolsky <autarch@urth.org>
Mon, 4 Apr 2011 02:18:12 +0000 (21:18 -0500)
commit61bcccfaa897c28765795e2afb9784035e206b1d
tree84d6c67230420bc35f23163253ae0794f382d862
parent72042ad72c251a1ae589675e696b31e0b47e8287
Update some conflicts to get people to install versions of MX modules that work with roles
dist.ini