Merge pull request #128 from logxen/edge
authorLogxen <logxen@hotmail.com>
Mon, 18 Feb 2013 16:54:03 +0000 (08:54 -0800)
committerLogxen <logxen@hotmail.com>
Mon, 18 Feb 2013 16:54:03 +0000 (08:54 -0800)
commit301c706abff2309b8d53d69bd00ae532a22ce5f5
tree751bd24eb16e62edccfb0f0e5bcf57326038094a
parent805ebfc91ff5b049125aff4f810c842b3fb3eb45
parentf1585b5fb456b9f483b34328cce1d31a35966647
Merge pull request #128 from logxen/edge

fixed merge error from the rename of Conveyor