projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7463af bbbac3d)
Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 28 Jan 2015 22:53:42 +0000 (17:53 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 28 Jan 2015 22:53:42 +0000 (17:53 -0500)

Trivial merge