Merge commit 'refs/merge-requests/102' of git://gitorious.org/gitorious/mainline
authorJohan Sørensen <johan@johansorensen.com>
Thu, 20 May 2010 08:30:40 +0000 (10:30 +0200)
committerJohan Sørensen <johan@johansorensen.com>
Thu, 20 May 2010 08:30:40 +0000 (10:30 +0200)
commit69d6b3fc375089e023a8ea8f72c37e3bc43b5bf7
tree34bdada5a433b21df31c2c28dc36079e03c35287
parente10ef2e223e85f25b2dcdf4a6c323730128b385a
parent187f963f2eb6f544a6652c27980c15ba1b37336a
Merge commit 'refs/merge-requests/102' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Fixed jQuery selector for avatar deletion form.

Conflicts:
app/views/groups/edit.html.erb
app/views/users/edit.html.erb
app/views/groups/edit.html.erb
app/views/users/edit.html.erb