projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 925fc16 19be88f)
Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Mon, 9 Mar 2015 14:27:50 +0000 (10:27 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Mon, 9 Mar 2015 14:27:50 +0000 (10:27 -0400)

Trivial merge