~vcs-imports/ipfire/ipfire-2.x

Viewing all changes in revision 2986.

  • Committer: Arne Fitzenreiter
  • Date: 2011-08-09 03:49:10 UTC
  • mfrom: (2913.11.23)
  • Revision ID: git-v1:c7a2cfc817ff9f8524048bffacacded2a24b970b
Merge branch 'master' into next

Conflicts:
        doc/language_missings

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: