Commit Graph

4 Commits

Author SHA1 Message Date
David Brown
26c96b6a60 Merge branch 'master' into el6
Conflicts:
	.gitignore
	sources
	torque-munge-size.patch
	torque.spec
2014-10-14 22:49:41 -07:00
Haïkel Guémar
1f2427ba04 upstream 4.2.6.1 2014-01-12 13:53:00 +01:00
Steve Traylen
65809ab2f7 Add or rather force munge support, Add torque-munge-size.patch. 2011-07-26 01:01:39 +02:00
Steve Traylen
5409298eac Add torque-munge-size.patch, rhbz#713996 2011-06-17 19:36:53 +02:00