Merge branch 'master' of github.com:Softmotions/ejdb
authoryudanov <fedwiz@academ.org>
Wed, 17 Jul 2013 11:15:01 +0000 (18:15 +0700)
committeryudanov <fedwiz@academ.org>
Wed, 17 Jul 2013 11:15:01 +0000 (18:15 +0700)

Trivial merge