[python-websockify/f18: 3/3] Merge branch 'master' into f18

[Pádraig Brady]

commit 7acc460372b9f122c2f1a66154f7f3e0808e320d
Merge: caf76ac 5c24223
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Mar 12 00:15:08 2013 +0000

    Merge branch 'master' into f18

 python-websockify.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---