Merge branch 'torsten/proplist' into next
authorTim Moore <timoore33@gmail.com>
Mon, 19 Apr 2010 10:22:48 +0000 (12:22 +0200)
committerTim Moore <timoore33@gmail.com>
Mon, 19 Apr 2010 10:22:48 +0000 (12:22 +0200)
commit4fae1160d4c8e6796fd4481a7c9b6470ed8e6158
tree495e08f13720f480a85a4ce88eb2fe6b447e3a81
parent0f9f0924121e680c68a1f6388d13a4c84ad1ded6
parent3e4a592282543cb25c6babffb9aa70d46f44e055
Merge branch 'torsten/proplist' into next