Commit b24a8921 authored 13 years ago by Rafaël Carré

Merge remote-tracking branch 'origin/master' into release

Conflicts:
	tools/build-system/launchpad/dput.conf
	tools/build-system/launchpad/sflphone-client-gnome/debian/control.natty

No related branches found

No related tags found

No related merge requests found

Showing with 1642 additions and 235 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment