Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 2 Dec 2011 04:22:12 +0000 (23:22 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 2 Dec 2011 04:22:12 +0000 (23:22 -0500)
commitfe5cc3b7f8d42d842153996ca9790027a466689a
tree6a8870b694e68d0d35310a1d18b6ae3ff86b6b10
parentf8c3eb9568fcaff41afb257f6058d1f33ae14358
parent5d901f1ba0b2f4444e484b9cb3db8d86c428af3f
Merge branch '0.4.x' into 0.5.x

(no actual changes)