&eche|on
&zzz
+R4SAS
+RN
+StormyCloud
+T3s|4
+acetone
+cumlord
+dr|z3d
+eche|off
+mareki2p
+not_bob_afk
+orignal
+postman
+qend-irc2p
+snex
Arch
BubbRubb
Chrono
Daddy_
Dann
Guest99
Irc2PGuest20149
Irc2PGuest21753
Irc2PGuest32716
Irc2PGuest50537
Irc2PGuest63942
Irc2PGuest74254
Irc2PGuest95708
Onn4l7h
Onn4|7h
Over
Sisyphus
Sleepy
SlippyJoe_
T3s|4_
Teeed
Yotsu
aargh2
ac9f
anontor
b3t4f4c3___
dr4wd3
duanin2
duck
elthommy
eyedeekay_bnc
gellegery
leopold_
makoto
matean
n1
nilbog
poriori_
profetikla
r00tobo
rapidash
shiver_
solidx66
thetia
u5657
uop23ip
w8rabbit
wodencafe2
x74a6
xHarr
zzz
eyedeekay, I'm in trouble here, there's a lot more to do than I thought
zzz
I need to rebase so I can see what I'm doing
zzz
what branch should I rebase into or should I create yet another one?
eyedeekay
Creating another one is probably easiest to keep track of
zzz
ok, will do, thanks
zzz
ok still had that build.xml conflict but fixed it. pushed jetty12-rb which is the same as jetty12-2 but rebased to master
zzz
where are we with the SAM PR? you were going to do a command line merge?
eyedeekay
Yes I am going to do a local merge and push it onto master myself
eyedeekay
Can do that for all of them unless you would rather do it for jetty12
zzz
just do the SAM one for now, nothing else is ready, we can decide when we get there
eyedeekay
Ok