projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15a9221 4d9f975)
Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 24 May 2016 19:17:58 +0000 (15:17 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 24 May 2016 19:17:58 +0000 (15:17 -0400)

Trivial merge