Merge remote branch 'upstream/lex' into nvp
Merge remote-tracking branch 'upstream/lex' into nvp
troubleshooting mathparser
Merge branch 'nvp' of github.com:reolyze/Mogu into nvp
Merge remote branch 'upstream/lex' into nvp
moving files
iterator changes for mathparser
resolving mathparser merge conflicts
merge conflicts
fixing an accidental deletion
command parsing
Merge branch 'nvp' of http://www.github.com/reolyze/Mogu into lex
Fix newstyle enum references in NodeValue