[california/wip/725767-week: 3/3] Merge branch 'master' into wip/725767-week



commit f21896c21fa1a2a865f7542ac4fb1740fa47ee81
Merge: 6e85995 32534ed
Author: Jim Nelson <jim yorba org>
Date:   Thu May 22 15:30:54 2014 -0700

    Merge branch 'master' into wip/725767-week

 debian/rules |    2 +-
 po/de.po     |  355 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 298 insertions(+), 59 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]