Merge pull request #656 from jellehenkens/2.2-coding-conventions

Fixing code conventions
This commit is contained in:
Mark Story 2012-05-19 08:56:02 -07:00
commit df684ca9fe
30 changed files with 83 additions and 83 deletions