Merge branch 'master' of dmz:gbs
authorRolla Selbak <rolla.n.selbak@intel.com>
Fri, 30 Dec 2011 09:32:00 +0000 (01:32 -0800)
committerRolla Selbak <rolla.n.selbak@intel.com>
Fri, 30 Dec 2011 09:32:00 +0000 (01:32 -0800)
commit275accd22f4a8c7fad37e7616f751d0e7cf247d6
tree200c909496cd43b905abd9b1ae20ad31bf40bf2a
parentd82320a94d286ae875b7cd571eb5e37db95b11ba
parentf2bdbbdf6e24014fceab31165042d8be446f926a
Merge branch 'master' of dmz:gbs
gitbuildsys/conf.py