Merge branch 'session-content-as-yaml-dump'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 14:34:05 +0000 (15:34 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 14:34:05 +0000 (15:34 +0100)

Trivial merge