Merge branch 'mob' into topic-telepathy
commite59dea87ab0e87dea3e3921ff3107c948a1861dd
authorStefan Becker <chemobejk@gmail.com>
Tue, 23 Apr 2013 18:15:54 +0000 (23 21:15 +0300)
committerStefan Becker <chemobejk@gmail.com>
Tue, 23 Apr 2013 18:15:54 +0000 (23 21:15 +0300)
tree02d66bd6bf9117880add2711188f622a2bde9b7b
parent62eb1b2cbb3ef1b9946c2c912ccfc9def5dfc94a
parent3e360295793c0e01561146623329decfdbff3e36
Merge branch 'mob' into topic-telepathy