projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fef225 60678ee)
Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 29 Oct 2014 21:02:11 +0000 (17:02 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 29 Oct 2014 21:02:11 +0000 (17:02 -0400)

Trivial merge