Merge commit 'elmarco/master'
authorLennart Poettering <lennart@poettering.net>
Tue, 13 Jan 2009 23:22:27 +0000 (00:22 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 13 Jan 2009 23:22:27 +0000 (00:22 +0100)
1  2 
src/pulse/proplist.c

Simple merge