Merge branch 'fifteen'
authortanya <tanyshk@gmail.com>
Thu, 2 Sep 2010 13:53:05 +0000 (16:53 +0300)
committertanya <tanyshk@gmail.com>
Thu, 2 Sep 2010 13:53:05 +0000 (16:53 +0300)
commit93b1c83344e24315247974d3f1c556036ad2de49
treebf3ad3c1b4b8105268b79523de93df620c42f868
parent0fe7ea2694aff3433a46d5c7b16d44428164ceeb
parent5879abab7fb47330428ce2a1c4f7b86b5c8aa9a9
Merge branch 'fifteen'
applet/data/Makefile.am