Merge branch 'users'
authorMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:20:32 +0000 (22:20 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:20:32 +0000 (22:20 +0200)

Trivial merge