Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:30:43 +0000 (09:30 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:30:43 +0000 (09:30 -0600)
commit97b80e3fef28d367a5ed1d18893accd1416cdf3f
treea40afb3264d79d231a8356af5d3f61444c6c80e0
parent7b4e5943c4d8da20e6bfcc6517749108e88aa7a5
parent9b138221283f0b8e8df5a799f75d73fd456028a0
Merge branch 'branch-1.2' into debian