projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff51f88 30c0c01)
Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 30 Nov 2016 20:33:43 +0000 (15:33 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 30 Nov 2016 20:33:43 +0000 (15:33 -0500)

Trivial merge