]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Sun, 17 Apr 2011 23:33:25 +0000 (16:33 -0700)
committerZach Copley <zach@status.net>
Sun, 17 Apr 2011 23:33:25 +0000 (16:33 -0700)
commit8cfb81deac0c63787220909995b606fcb1300f59
tree6bd09a8a3dbf8aadb71d015b9ff49b67cb1ec5bd
parentd9cf0280d281c09042c704a0b87762ca41546c8f
parent4afe9c5885b8b375da7c5faf4f60e88200f691f6
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Remove empty locale files.
  Localisation updates from http://translatewiki.net.