Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 May 2013 16:13:17 +0000 (11:13 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 May 2013 16:13:17 +0000 (11:13 -0500)
commitb69dd853049fd7560542b47bac73675b33c78364
tree23114fec510a1a169f1ffe5d2374efc6a417c804
parent9a9bafc078192317695a4f06233ea261fe147989
parent5fa843f31fc5cc95586f23badc8a06eba4fae5b4
Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'