projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0950ff9 c1e9a70)
Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:08:51 +0000 (18:08 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 23:08:51 +0000 (18:08 -0500)

Trivial merge