Merge branch 'fix-help-translations' of https://github.com/tcatm/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 16 Dec 2011 21:37:24 +0000 (16:37 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 16 Dec 2011 21:37:24 +0000 (16:37 -0500)
commitab6c45372c61d2092ca888108bdc9067a1115b8e
tree5831914064dce99ea7eb27b57b3a542bbf81de4d
parent8896c2d9d64d71e25b31d7a389f0b8db49a1e50a
parent43421af2e4714f8d1fee711d16a07a9c1eea8c75
Merge branch 'fix-help-translations' of https://github.com/tcatm/bitcoin