Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Dec 2011 21:05:32 +0000 (16:05 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Dec 2011 21:05:32 +0000 (16:05 -0500)
commit96c700f5e4b283e5479505d1e5f8fc9884dc1ff5
tree517333f3f1f691bb909797d51410ce0ceb11de18
parent7aa253d3ec746c3d4ddbd55fab55d0eff28294f8
parentf503a1486a6cbda8d0e73923fec8de3ced253b28
Merge branch '0.5.0.x' into 0.5.x