Merge branch 'branch-1.3' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 23 Jan 2014 03:55:41 +0000 (20:55 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 23 Jan 2014 03:55:41 +0000 (20:55 -0700)
commit9884ca1449167a06bd2cebc7d28353eeac592493
tree9fde328b3a5971c67954e669c1ba27042821fd8c
parent8e669694a60d34e2ea0f8f6b189e0bc3605d94d7
parent0ef0c50536e5eb6ad3455b5828983307edbab828
Merge branch 'branch-1.3' into debian