Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:39:13 +0000 (09:39 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:39:13 +0000 (09:39 -0600)
commit28d7fe977b17a861a8197c1412915a24978db38e
tree772eb0451be9d915aa6307635e3f5557311c9134
parent97b80e3fef28d367a5ed1d18893accd1416cdf3f
parenta261bdbba3301cd29c1be7ba85f695f7b434cb03
Merge branch 'branch-1.2' into debian