Merge branch 'dialog_integration'
authorManuel Unglaub <m.unglaub@gmail.com>
Wed, 3 Nov 2010 16:05:44 +0000 (17:05 +0100)
committerManuel Unglaub <m.unglaub@gmail.com>
Wed, 3 Nov 2010 16:05:44 +0000 (17:05 +0100)
commit14588b06cffb7319d450be3b5b61c734002f8788
tree46b716ddd9dbd7902953a8ece73e1a186be616f0
parentb3b5a85bacf534c2bc901f820ccb2f9e35e8159f
parent08179b38c27f537641a4370f16bc12f8502413f8
Merge branch 'dialog_integration'