diff options
author | Michal Čihař <mcihar@novell.com> | 2010-07-20 16:46:46 +0400 |
---|---|---|
committer | Michal Čihař <mcihar@novell.com> | 2010-07-20 16:46:46 +0400 |
commit | 907663959b30a7f269d722201599db6ed7b31347 (patch) | |
tree | 1fcca18c69818181695b4e8b4405b561fa6a4fc1 /server_binlog.php | |
parent | 0f090b8d7a7446b9d8621329e63470ee5bfda227 (diff) | |
parent | 2288d4bf2e8bc30f9b7ff8e28911f046a1b0cfb2 (diff) |
Merge remote branch 'pootle/master'
Conflicts:
po/ug.po
Diffstat (limited to 'server_binlog.php')
0 files changed, 0 insertions, 0 deletions