&zzz
+R4SAS
+RN_
+T3s|4
+eche|off
+nilbog
+orignal
+postman
+qend-irc2p
+sourceress
Arch
Birdy
Danny
Irc2PGuest30010
Irc2PGuest36077
Irc2PGuest49364
Irc2PGuest51117
Irc2PGuest6564
Irc2PGuest65656
Irc2PGuest67278
Irc2PGuest74235
Irc2PGuest83482
MatrixBot
Onn4l7h
Over
Sleepy
Teeed
Yotsu
__bob_
aargh3
ac9f
acetone_
ahiru
anontor
b3t4f4c3__
cims
dr4wd3_
dr|z3d
duanin2
hababam
hagen_
leopold
makoto
marek
marek22k
n2
noidea
not_bob_afk2
nyaa2pguy
o3d3_
poriori
profetikla
r00tobo
rapidash
solidx66
stormycloud[m]
test7363673
uop23ip
urist_
user_
w8rabbit
zelgomer
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