conflict on mx-attribute-deflator 2.1.5 2.0102
authorJesse Luehrs <doy@tozt.net>
Sat, 18 Jun 2011 17:44:40 +0000 (12:44 -0500)
committerJesse Luehrs <doy@tozt.net>
Sat, 18 Jun 2011 17:44:40 +0000 (12:44 -0500)
commit4b2685cb003b6550ffec8ae1b3d8785af671dbd7
tree1913d7fe60586dc70489677eaf07660291409d23
parent9987c5054229000b2864b21993e7f1d0bcd457dc
conflict on mx-attribute-deflator 2.1.5
dist.ini