projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e3f36e 0f50a5c)
Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 15:39:47 +0000 (11:39 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 15:39:47 +0000 (11:39 -0400)

Trivial merge