Merge remote-tracking branch 'origin/bug/13659' into release/0.10.1
commit2625a1053569a1734b411e7ece0b204465f6b8fb
authorChance Zibolski <chance.zibolski@gmail.com>
Wed, 10 Jul 2013 18:21:19 +0000 (10 11:21 -0700)
committerChance Zibolski <chance.zibolski@gmail.com>
Wed, 10 Jul 2013 18:21:19 +0000 (10 11:21 -0700)
treee4b29e4aba92f9bc0f246763c0a5c6e89c8274a1
parent6a6c08be4b8aa9a04749ee774fa825d320da56cf
parent393f2c6678aaea1d2e34665fab9394fce3cb9408
Merge remote-tracking branch 'origin/bug/13659' into release/0.10.1

* origin/bug/13659:
  Fix typo "memroy" in views/virtual_machine.py