Merge branch 'multiple-accounts'
authorMiltiadis Vasilakis <mvasilak@gmail.com>
Wed, 29 Feb 2012 19:53:41 +0000 (21:53 +0200)
committerMiltiadis Vasilakis <mvasilak@gmail.com>
Wed, 29 Feb 2012 19:53:41 +0000 (21:53 +0200)

Trivial merge