Merge remote-tracking branch 'origin/master'
commitd177e1ab8a67f57580cfcd41c65e09f9808c68fc
authorPootle server <pootle@cihar.com>
Sun, 23 Oct 2011 14:40:07 +0000 (23 16:40 +0200)
committerPootle server <pootle@cihar.com>
Sun, 23 Oct 2011 14:40:07 +0000 (23 16:40 +0200)
tree96f2b2deadd4a590313153eb5584575164d235e7
parenta7c350f202be369ea5bc199f52f3e20266e03cce
parentecb05de4f6a4cb0011f24465fe1985f8e7573986
Merge remote-tracking branch 'origin/master'