Merge branch '1.1'
authorShaun McCance <shaunm@gnome.org>
Sun, 24 Jun 2012 14:26:00 +0000 (10:26 -0400)
committerShaun McCance <shaunm@gnome.org>
Sun, 24 Jun 2012 14:26:00 +0000 (10:26 -0400)
commit6fce21cd7b4417d8ea8cff3a8f2c79063d5353a3
tree7bd2f6dd0b3ab4eebf62dbd7292fe845826e2893
parentf951a0f451451acaa3ffdd8d1e8e598615ab2d21
parent470b52ad6d4f55b32a56d95671d608c483dbeae7
Merge branch '1.1'