| commit | 76a7354f206729c13b2a6493e28558b2a00ea2cb | |
| author | James Liggett <jrliggett@cox.net> | |
| Tue, 1 Jun 2010 02:14:31 +0000 (31 19:14 -0700) | ||
| committer | James Liggett <jrliggett@cox.net> | |
| Tue, 1 Jun 2010 02:14:31 +0000 (31 19:14 -0700) | ||
| tree | dae962217276fbabe21684421c03d5c09169311e | treesnapshot (tar.gz zip) |
| parent | 22697c7325d2cf04bd26f339e2e2b638c9f2af53 | commitdiff |
| parent | 2974d74ac1d4028f189307ff8cec35bbf5926aae | commitdiff |
Merge branch 'master' into git-shell
Conflicts:
po/nb.po
Conflicts:
po/nb.po