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

Viewing all changes in revision 4430.

  • Committer: Dirk Wagner
  • Date: 2014-08-11 19:05:14 UTC
  • mfrom: (4405.1.185)
  • Revision ID: git-v1:f5480b13dd11f35cb6792c9f3cc867a1c0cff158
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: