Merge commit 'akita/master'
authorJohan Sørensen <johan@johansorensen.com>
Fri, 16 Jan 2009 11:24:03 +0000 (12:24 +0100)
committerJohan Sørensen <johan@johansorensen.com>
Fri, 16 Jan 2009 11:24:03 +0000 (12:24 +0100)
commitfb0394f033262603d60de992664c20bb4d458d35
tree2c1077de9a9f70e2a1dc03b123f0b460f6340375
parent4fc2d160bd9fe5b188e998d937b54347566f6273
parentc98104a3e7d8516e4c7ff6b241e778b7595d5197
Merge commit 'akita/master'

* commit 'akita/master':
  Added pt-BR translation for the new Wiki feature. Added 'reset password' feature for the Administrator's User Management table