[gupnp-vala/f16: 5/5] fix merge

[Peter Robinson]

commit 0594f5d63c451b9ddde973c4716b8a97112ca8fb
Merge: 06df753 8370414
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Aug 28 11:01:51 2012 +0100

    fix merge

 .gitignore      |    2 +-
 gupnp-vala.spec |   11 ++++++++---
 sources         |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---