Merged Fredi's latest changes.

This commit is contained in:
Vincent Rivière
2012-06-13 20:20:28 +00:00
parent c2eebd6339
commit f03dd4ed1f
3 changed files with 77 additions and 59 deletions