Merge remote-tracking branch 'kde/master'xtuple/2013-01-11
commit820a221ddcf9feaa867f6cb2b083c5c1af0316ff
authorJan Kundrát <jkt@flaska.net>
Fri, 11 Jan 2013 17:39:12 +0000 (11 18:39 +0100)
committerJan Kundrát <jkt@flaska.net>
Fri, 11 Jan 2013 17:39:12 +0000 (11 18:39 +0100)
tree321ea800bcfa281506a51a64fa5074b2f1f9ac87
parent0faa4065336e15c29f4ec0c9064f0017f6e6ac18
parent58040a379e113e51fd91fd874a17d8a39d595956
Merge remote-tracking branch 'kde/master'