Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Tue, 28 Oct 2014 18:16:01 +0000 (14:16 -0400)
committerrsiddharth <rsd@gnu.org>
Tue, 28 Oct 2014 18:16:01 +0000 (14:16 -0400)
commit00efc9f44c2246deb97ce7bb9fe460cecd10718b
treee1a1137762c631aec174a442acbb24dcdaab9649
parent02656bf12409facec9ca53ffa55e1513d7819975
parentabb35d1a9667f962e2f4672d8f9deb42747f036d
Merge branch 'master' into stable