Merge branch 'master' of http://git.gitorious.org/~melanie/igd2-for-linux/melanies...
authorOpen Source <opensource@tieto.com>
Mon, 14 Mar 2011 06:38:00 +0000 (08:38 +0200)
committerOpen Source <opensource@tieto.com>
Mon, 14 Mar 2011 06:38:00 +0000 (08:38 +0200)
commit8b671d9b0c46c6022b2894127b03e98ddfee195b
treebb52c4c87b178e9745000ffc25c1acb75d0f8c92
parent20523e295a5a2c5fcb65a9d7ab4ce36ecceb069c
parent83aa6cd3cc4b307ba63fd09b56bba1d84ebd81b7
Merge branch 'master' of git.gitorious.org/~melanie/igd2-for-linux/melanies-deviceprotection into bugfixes