Merge branch 'innosend'
commitd8007a21f4ec17588f9339d99729c8feaeacbefd
authorFelix Bechstein <f@ub0r.de>
Wed, 11 Nov 2009 20:00:56 +0000 (11 21:00 +0100)
committerFelix Bechstein <f@ub0r.de>
Wed, 11 Nov 2009 20:00:56 +0000 (11 21:00 +0100)
treec8782cdf171a81ddf86eac398a7f439fabf2b386
parent4b72ba49428510df18dd0aa4708db521851d1e96
parent38f2a231e3fe570bfc2cd0ecd777e789d6f1ea7f
Merge branch 'innosend'
res/values/strings.xml