projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69a9206 cf0d544)
Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 20:34:33 +0000 (16:34 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 20:34:33 +0000 (16:34 -0400)

Trivial merge