merge conflict solved and added new version
authorMichael Totschnig <michael@totschnig.org>
Sat, 9 Nov 2013 11:46:32 +0000 (12:46 +0100)
committerMichael Totschnig <michael@totschnig.org>
Sat, 9 Nov 2013 11:46:32 +0000 (12:46 +0100)
commit0da3f1708cbc80ea5b331b0104b0b3cdba8d313f
tree0840f0ec7711f340afd710a59ac36454c484c0f6
parent55db5a10a0c72037dc15378827d09781fdd3c0b3
parent2fc85cb97b720a5557df28fd274249131afcb573
merge conflict solved and added new version
metadata/org.totschnig.myexpenses.txt
metadata/org.totschnig.sendwithftp.txt