~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

Viewing all changes in revision 22.

  • Committer: Jackson Doak
  • Date: 2013-07-10 21:04:46 UTC
  • mfrom: (20.1.3 sid)
  • Revision ID: noskcaj@ubuntu.com-20130710210446-y8f587vza807icr9
Properly merged from upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: