gtk-screen: merge for pango-layout-set-markup
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 5 Feb 2013 20:48:24 +0000 (13:48 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 5 Feb 2013 20:48:24 +0000 (13:48 -0700)

Trivial merge