]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Wed, 18 Nov 2009 20:48:17 +0000 (12:48 -0800)
committerZach Copley <zach@status.net>
Wed, 18 Nov 2009 20:48:17 +0000 (12:48 -0800)
commit8f2db3820f6ab2c8881521c0adc9a6427b5ea86b
tree468438bbb16ddaaa4960ec6079fb6acf754b61cf
parent9baddf4e44e173e3e70c4c3f2198857f16320544
parent645b7dec2b40fb9c34306e7b445a120c6c09382d
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Terminology consistency fix: 'Unlock' -> 'Unblock' in unblock form description.
  Localisation updates from !translatewiki !StatusNet
  Check for dupe from insertNoticeItem()