Merge remote-tracking branch 'origin/master'
commit794c65068facc44e1f8e63a0ddecb0b5070caafd
authorPootle server <pootle@cihar.com>
Sat, 26 Nov 2011 11:40:14 +0000 (26 12:40 +0100)
committerPootle server <pootle@cihar.com>
Sat, 26 Nov 2011 11:40:14 +0000 (26 12:40 +0100)
tree24589de6bbbc8895e930d13c5c278e2fbce43afc
parentb0e3696a250d3cc2232ed734daabc549432ccf72
parent277b6a96fa8046fe9eaaec61cee50ad675766262
Merge remote-tracking branch 'origin/master'