projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 205a3f9 f3c0ef0)
Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Fri, 20 Feb 2015 20:10:02 +0000 (15:10 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Fri, 20 Feb 2015 20:10:02 +0000 (15:10 -0500)

Trivial merge