[iwhd: 2/5] Merge branch 'master' of ssh://pkgs.fedoraproject.org/iwhd

[Pete Zaitcev]

commit 3b6ac4cf3e5c5dee87f6d11c9fc932ade0e4aeec
Merge: 1c7917f 391306c
Author: Pete Zaitcev <zaitcev at yahoo.com>
Date:   Mon Oct 31 18:55:31 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/iwhd

 .gitignore                                   |    1 +
 iwhd-workaround-jansson-2.1-api-change.patch |   71 --------------------------
 iwhd.spec                                    |   26 ++++++----
 sources                                      |    2 +-
 4 files changed, 17 insertions(+), 83 deletions(-)
---