| commit | b3cebe9b8d26c35081bd9c73ac9b3e3577b809e7 | |
| author | James Liggett <jrliggett@cox.net> | |
| Mon, 27 Sep 2010 23:57:15 +0000 (27 16:57 -0700) | ||
| committer | James Liggett <jrliggett@cox.net> | |
| Mon, 27 Sep 2010 23:57:15 +0000 (27 16:57 -0700) | ||
| tree | e9906f1aa837df02c70045ecb15f2bca0c2b6848 | treesnapshot (tar.gz zip) |
| parent | cfbec2376f1d4571899f0a10a08972a81cd9934c | commitdiff |
| parent | 2704dcc1c94cb9a7392f0c59767078db9e47a665 | commitdiff |
Merge branch 'master' into git-shell
Conflicts:
po/pt.po
po/ru.po
Conflicts:
po/pt.po
po/ru.po