[python-websockify/el6: 2/2] Merge branch 'master' into el6

[Pádraig Brady]

commit 7b8926fc30b4451fd19a389558afc869c1895d99
Merge: bd89dae 5afe400
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Jun 20 14:10:34 2013 +0100

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 python-websockify.spec                             |   19 ++++------
 sources                                            |    2 +-
 websockify-0.2-fix-setup-py-version.patch          |   26 --------------
 ...ify-0.2-handle-errors-when-popping-kwargs.patch |   37 --------------------
 5 files changed, 10 insertions(+), 75 deletions(-)
---