Merge branch 'master' of http://git.gitorious.org/~melanie/igd2-for-linux/melanies...
authorJukka Kinnunen <jukka.kinnunen@tieto.com>
Fri, 18 Mar 2011 08:21:59 +0000 (10:21 +0200)
committerJukka Kinnunen <jukka.kinnunen@tieto.com>
Fri, 18 Mar 2011 08:21:59 +0000 (10:21 +0200)
commitbe85552e2d484825022615c43988abce5985bd3c
treeedde3cbb5d63be6f617a965962e3aac197df1b0d
parent8b671d9b0c46c6022b2894127b03e98ddfee195b
parente810790c9be9bf33b5bb8ffc0b247e95e49a8eb2
Merge branch 'master' of git.gitorious.org/~melanie/igd2-for-linux/melanies-deviceprotection into bugfixes