[Swan-commit] Changes to ref refs/heads/master

[Tuomo Soini]

New commits:
commit 799e8b10e34f26dee3064f03fec127fdf015ec54
Merge: 8d5193e b027e81
Author: Tuomo Soini <tis at foobar.fi>
Date:   Wed Feb 26 19:23:56 2014 +0200

    Merge branch 'lswbz67'

commit b027e81a1d8448eeb90e61779435df9cd9a34275
Merge: 1009de9 8d5193e
Author: Tuomo Soini <tis at foobar.fi>
Date:   Wed Feb 26 19:23:22 2014 +0200

    Merge branch 'master' into lswbz67

commit 1009de9a7e95652141de5415efad5cf8a74c9afc
Author: Tuomo Soini <tis at foobar.fi>
Date:   Wed Feb 26 19:17:07 2014 +0200

    CHANGES: update for bug#67 fix

commit e2806d6b563bf91ea133a9839bcea3056a83c338
Author: Tuomo Soini <tis at foobar.fi>
Date:   Wed Feb 26 19:14:25 2014 +0200

    uniqueids: don't compare ipv4 and ipv6 addresses, fixes bug#67