projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b46de3 0884e91)
Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 24 Nov 2015 20:33:12 +0000 (15:33 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 24 Nov 2015 20:33:12 +0000 (15:33 -0500)

Trivial merge