Merge remote-tracking branch 'origin/master' into jsonexport
authoradam <adamansky@gmail.com>
Wed, 17 Jul 2013 11:36:09 +0000 (18:36 +0700)
committeradam <adamansky@gmail.com>
Wed, 17 Jul 2013 11:36:09 +0000 (18:36 +0700)

Trivial merge