Merge with default

--HG--
branch : quitta-gsoc-2013
This commit is contained in:
Quitta 2013-06-06 23:55:04 +02:00
commit bc7de92500

Diff content is not available