Merge branch 'master' into gtkbuilder
commit5be552b04084f7f2b9a84abd70f3e386d149be54
authorMatthew Brush <codebrainz@codebrainz.ca>
Tue, 11 Oct 2011 22:58:44 +0000 (11 15:58 -0700)
committerMatthew Brush <codebrainz@codebrainz.ca>
Tue, 11 Oct 2011 22:58:44 +0000 (11 15:58 -0700)
tree7dfcd909abebc600cdb1a301838a7d4f683042df
parent4bf5aef08a7507db6de873e5b2aaf7a5ab644c59
parent9a2466a1ef753dc5810b76d6940dc6195a3f5c95
Merge branch 'master' into gtkbuilder