Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:30:32 +0000 (10:30 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:30:35 +0000 (10:30 -0400)
commitef9ab3c2a0c5f2d8862e7315a01f9cfd7bee242d
treee5905bedb9e555fac51f71f6c191033c9dd2265f
parentdce656f9e0b7283e842225c6c75396532c659858
parent1fafcee66db843689e2071e844f5e4ab27b8133b
Merge branch '0.5.0.x' into 0.5.x