Merge remote branch 'aaronw/feature469_comment_form_under_comments'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Sat, 15 Oct 2011 11:54:58 +0000 (13:54 +0200)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Sat, 15 Oct 2011 11:54:58 +0000 (13:54 +0200)
commit48ba47b5704f757f4ffae5aa9769f19d8f55d371
tree693dd47b8fea1b4444e9a050e99010347db0398d
parent917d4663afedded7e6606b1a799771da8dc2a37c
parentf7ede646e4e33175af9b72c1b2b23674a558a698
Merge remote branch 'aaronw/feature469_comment_form_under_comments'

* aaronw/feature469_comment_form_under_comments:
  Put the trans tag in the right place.
  Move comment form below comments.