[pkg-wpa-devel] [wpa] 01/06: Merge remote-tracking branch 'remotes/origin/debian/sid' into debian/master

[Andrew Shadura]

This is an automated email from the git hooks/post-receive script.

andrewsh pushed a commit to annotated tag debian/2.6-1
in repository wpa.

commit 429bb614efa303ca5c5bba1c717cad729c37430b
Merge: b6089f9 5ca765a
Author: Andrew Shadura <andrewsh at debian.org>
Date:   Thu Oct 20 18:17:07 2016 +0200

    Merge remote-tracking branch 'remotes/origin/debian/sid' into debian/master
    
    2.5-3 never happened.

 debian/changelog                                            | 11 ++++++++---
 debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch |  2 +-
 debian/rules                                                |  6 +++---
 debian/system-sleep/wpasupplicant                           |  2 ++
 4 files changed, 14 insertions(+), 7 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wpa.git