Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-11-08 00:12:29 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-11-08 00:12:29 (GMT)
commit4739976d0a96eb21b8f606c69ecc09ca7a1557de (patch)
tree57170dde71aee01aac39059ebd300a3e5aa9e7e3 /po
parentb81f399d5c57465e95cca0fac241975bc75df303 (diff)
parenta7a87c7fa872418f8db1af7badd4c91e0481c2af (diff)
Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration
Conflicts: NEWS activity/activity.info
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions